diff options
| author | drh <drh@noemail.net> | 2016-01-14 14:48:17 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-01-14 14:48:17 +0000 |
| commit | cb75bff3f7fe12fd3d5dd94acd2832ef1e0dcb65 (patch) | |
| tree | da3eeb2fcab166e7e3b9e23526184dc84e286352 /src/main.c | |
| parent | 604ce70448d0572477ad25bb3510b1dc3f2ad967 (diff) | |
| parent | 0ea94db612e0f2348b45dafcedf21d9a8f68c60b (diff) | |
| download | sqlite-cb75bff3f7fe12fd3d5dd94acd2832ef1e0dcb65.tar.gz sqlite-cb75bff3f7fe12fd3d5dd94acd2832ef1e0dcb65.zip | |
Merge the latest fixes and enhancements from trunk.
FossilOrigin-Name: 007e5c6df60f9743ac6914332f59925e4a7a861c
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 2652bfc5c..b37cec8b1 100644 --- a/src/main.c +++ b/src/main.c @@ -3445,6 +3445,9 @@ int sqlite3_file_control(sqlite3 *db, const char *zDbName, int op, void *pArg){ }else if( op==SQLITE_FCNTL_VFS_POINTER ){ *(sqlite3_vfs**)pArg = sqlite3PagerVfs(pPager); rc = SQLITE_OK; + }else if( op==SQLITE_FCNTL_JOURNAL_POINTER ){ + *(sqlite3_file**)pArg = sqlite3PagerJrnlFile(pPager); + rc = SQLITE_OK; }else if( fd->pMethods ){ rc = sqlite3OsFileControl(fd, op, pArg); }else{ |