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 recent enhancements from trunk.

Browse Source 
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
This commit is contained in:
drh
2015-12-02 20:40:26 +00:00
parent 769dc6e2a2 f7ce4291a9
commit 1bb15fc973
72 changed files with 2424 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.c
View File

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