database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Merge the latest fixes and enhancements from trunk.

Browse Source 
FossilOrigin-Name: 007e5c6df60f9743ac6914332f59925e4a7a861c
This commit is contained in:
drh
2016-01-14 14:48:17 +00:00
parent 604ce70448 0ea94db612
commit cb75bff3f7
64 changed files with 3572 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.c
View File

@@ -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{