From: drh Date: Mon, 2 Dec 2013 21:25:40 +0000 (+0000) Subject: Another #if SQLITE_VERSION_NUMBER macro in speedtest1.c for compatibility X-Git-Tag: version-3.8.2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a702db1cf51dc94db0f40e8dd8e8ce60612180c;p=thirdparty%2Fsqlite.git Another #if SQLITE_VERSION_NUMBER macro in speedtest1.c for compatibility with older versions of SQLite. FossilOrigin-Name: bc8eacc7f71413184ef5be1412e51f8fd7174cd1 --- diff --git a/manifest b/manifest index f04576e670..baeef82ada 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Still\smore\s#if\sSQLITE_VERSION_NUMBER\smacros\sin\stest/speedtest1.c\sto\senable\ncompilation\sagainst\solder\sversions\sof\sSQLite. -D 2013-12-02T01:24:05.116 +C Another\s#if\sSQLITE_VERSION_NUMBER\smacro\sin\sspeedtest1.c\sfor\scompatibility\nwith\solder\sversions\sof\sSQLite. +D 2013-12-02T21:25:40.013 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -820,7 +820,7 @@ F test/speed3.test d32043614c08c53eafdc80f33191d5bd9b920523 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b -F test/speedtest1.c ae9d739b7ffba4d63086e365753c56561815514c +F test/speedtest1.c 4f1e34b6af9af0b59ca11b57d62c3cd851990fba F test/spellfix.test 8c40b169b104086d8795781f670ba3c786d6d8be F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298 F test/stat.test c8eccfe8fcd3f3cfc864ce22d5b9e803a3c69940 @@ -1145,7 +1145,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 a9e1627ae714156cf6bd419e41cf9b79fbbe99a9 -R 84934b6097c3af0a8962d3cfd75d2be6 +P 4b20cf4206ac12975ca9c4ec7ef76aa21bbd734d +R fc7264469bd7eed8b2c47bd423fccf15 U drh -Z a36aa806db8ddb60dca1807195d9ce52 +Z f0389d08b87706a34ccfa173cc3d5e77 diff --git a/manifest.uuid b/manifest.uuid index a685b51324..c2586c5739 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4b20cf4206ac12975ca9c4ec7ef76aa21bbd734d \ No newline at end of file +bc8eacc7f71413184ef5be1412e51f8fd7174cd1 \ No newline at end of file diff --git a/test/speedtest1.c b/test/speedtest1.c index 766e80dac6..f3e79ec816 100644 --- a/test/speedtest1.c +++ b/test/speedtest1.c @@ -922,9 +922,11 @@ int main(int argc, char **argv){ sqlite3_db_status(g.db, SQLITE_DBSTATUS_CACHE_HIT, &iCur, &iHi, 1); printf("-- Page cache hits: %d\n", iCur); sqlite3_db_status(g.db, SQLITE_DBSTATUS_CACHE_MISS, &iCur, &iHi, 1); - printf("-- Page cache misses: %d\n", iCur); + printf("-- Page cache misses: %d\n", iCur); +#if SQLITE_VERSION_NUMBER>=3007012 sqlite3_db_status(g.db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHi, 1); printf("-- Page cache writes: %d\n", iCur); +#endif sqlite3_db_status(g.db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHi, 0); printf("-- Schema Heap Usage: %d bytes\n", iCur); sqlite3_db_status(g.db, SQLITE_DBSTATUS_STMT_USED, &iCur, &iHi, 0);