diff --git a/ext/misc/vfslog.c b/ext/misc/vfslog.c index 7cc1083303..7b2f99bc51 100644 --- a/ext/misc/vfslog.c +++ b/ext/misc/vfslog.c @@ -514,7 +514,15 @@ static int vlogFileControl(sqlite3_file *pFile, int op, void *pArg){ *(char**)pArg = sqlite3_mprintf("vlog/%z", *(char**)pArg); } tElapse = vlog_time() - tStart; - vlogLogPrint(p->pLog, tStart, tElapse, "FILECONTROL", op, -1, 0, rc); + if( op==SQLITE_FCNTL_PRAGMA ){ + const char **azArg = (const char **)pArg; + vlogLogPrint(p->pLog, tStart, tElapse, "FILECONTROL", op, -1, azArg[1], rc); + }else if( op==SQLITE_FCNTL_SIZE_HINT ){ + sqlite3_int64 sz = *(sqlite3_int64*)pArg; + vlogLogPrint(p->pLog, tStart, tElapse, "FILECONTROL", op, sz, 0, rc); + }else{ + vlogLogPrint(p->pLog, tStart, tElapse, "FILECONTROL", op, -1, 0, rc); + } return rc; } diff --git a/manifest b/manifest index 36384669c1..d971ccd89b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s3.8.1 -D 2013-10-17T12:57:35.458 +C In\sthe\svfslog\sextension\sfor\sFILECONTROL\srecords,\sshow\sthe\spragma\sname\sfor\nSQLITE_FCNTL_PRAGMAs\sand\sthe\srequested\ssize\sfor\sSQLITE_FCNTL_SIZE_HINT. +D 2013-10-18T14:37:26.422 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -116,7 +116,7 @@ F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a F ext/misc/spellfix.c 5e1d547e9a2aed13897fa91bac924333f62fd2d9 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512 -F ext/misc/vfslog.c 1abb192d8d4bd323adbddec0c024580496b51b7a +F ext/misc/vfslog.c f3288d66e699fee093497d449996c69eef1c0354 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 @@ -1126,10 +1126,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P e5a439cfa5c921187e4aa7050832ec2660fba13d -R 306f92498230c90834f5567c36b98354 -T +bgcolor * #d0c0ff -T +sym-release * -T +sym-version-3.8.1 * +P c78be6d786c19073b3a6730dfe3fb1be54f5657a +R 922e3640e2dff0c501dabe2407303992 U drh -Z 83ae1adeb4d6f6ab1edc809d597efad3 +Z 20507bcad5bb086518e04051643ef0df diff --git a/manifest.uuid b/manifest.uuid index d6d746f4ac..a44be59dfc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c78be6d786c19073b3a6730dfe3fb1be54f5657a \ No newline at end of file +f062969548da26850ceeb48d4283f6567f828887 \ No newline at end of file