diff options
author | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
commit | 1bb15fc973f5b1b472897095f629abcc663bd453 (patch) | |
tree | 4eda31846a69354eb5ba5ff9dc91602a18d942ac /src/main.c | |
parent | 769dc6e2a22b3104583ad357b01f31a22e146a5c (diff) | |
parent | f7ce4291a94573cdb04e5f3fcf59ed9e69226479 (diff) | |
download | sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.tar.gz sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.zip |
Merge recent enhancements from trunk.
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c index f7bab9b0e..65434db0d 100644 --- a/src/main.c +++ b/src/main.c @@ -3441,6 +3441,9 @@ int sqlite3_file_control(sqlite3 *db, const char *zDbName, int op, void *pArg){ if( op==SQLITE_FCNTL_FILE_POINTER ){ *(sqlite3_file**)pArg = fd; rc = SQLITE_OK; + }else if( op==SQLITE_FCNTL_VFS_POINTER ){ + *(sqlite3_vfs**)pArg = sqlite3PagerVfs(pPager); + rc = SQLITE_OK; }else if( fd->pMethods ){ rc = sqlite3OsFileControl(fd, op, pArg); }else{ |