Import the test_sqllog.c enhancements from trunk.

FossilOrigin-Name: 178da33909ff8e524cdefeede40fa5bd908efb37

diff --cc manifest
index 8b043169d101add832c7b5b907199d13f009ccbc,3af41656d61d9e662e7e36247f593bec5e697a82..4bb252f0909352603b5bed3b346116a39e2fd0e6
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk,\sand\sin\sparticular\sthe\n"PRAGMA\scache_spill=N"\schange.
- D 2015-11-12T16:51:43.106
 -C Add\sa\sspace\sbefore\seach\sline\sof\serror\soutput\sin\sthe\stest\sscripts\sso\sthat\sall\nerrors\scan\sbe\sconveniently\slocated\sin\slogs\sby\sdoing\s"grep\s'^\s'".
 -D 2015-11-12T21:42:40.423
 -F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
++C Import\sthe\stest_sqllog.c\senhancements\sfrom\strunk.
++D 2015-11-12T21:55:02.967
 +F Makefile.in eebca73951f1f5827925d997e634daef95fdd364
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e928e68168df69b353300ac87c10105206653a03
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -305,9 -302,9 +305,9 @@@ F src/hash.h c8f3c31722cf3277d037139097
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 419a947f27ce2da18eebf440a5aa80cc825defae
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
- F src/main.c dd2626547e553cf3a42994ede441e1ba0b942e72
 -F src/main.c bf26fbebab82069cd7d15c41a58110be8075c87e
++F src/main.c df7430d3b3834582aaf5968f674fe7b0eab70356
  F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -344,16 -341,15 +344,16 @@@ F src/resolve.c 1954a0f01bf65d78d7d559a
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 00a2a10d4298a685d0eeb05b09ef018a2bd81bf8
  F src/shell.c acefb4593a9bf0338a757c968f1f1bb05690d830
 -F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
 +F src/sqlite.h.in df28d4fdd2c6c902ed68bb4d0223e370f97c7d74
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h 26cd338647e097ce907be4be1f304d380d6ba346
 -F src/sqliteInt.h ebd88d3a2c03440f48145a47df51f0a502bbf24e
++F src/sqliteInt.h 40ca51b677d493a528ea026a927ac59378c0f819
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
- F src/test1.c 33e6b76796736fc16cc809dbb25c955318753c05
 -F src/test1.c 05df2a9e4f483b2fb642162209e3aeb11c24b44f
++F src/test1.c ef7958e80883c7e6a61465cb8ea3945c180d66e8
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -367,7 -363,7 +367,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 5b874ed96244f6d8422a217400a7ec92c80b4261
 -F src/test_config.c 7523f8bd7604aec88a9d1c303d93c925bcfcc9f9
++F src/test_config.c 8e17d2d3e24130658e7371a8114e7aa41a394088
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -390,8 -386,8 +390,8 @@@ F src/test_quota.h 2a8ad1952d1d2ca9af0c
  F src/test_rtree.c 43fff4c5a01576d6d213f27472598801a247890c
  F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
- F src/test_sqllog.c b690c12933f50ff46491e0d56a251f84ae16e914
+ F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
 -F src/test_superlock.c 06797157176eb7085027d9dd278c0d7a105e3ec9
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c 2e21ca7f7dc54a028f1967b63f1e76155c356f9b
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
@@@ -935,8 -930,8 +935,8 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
 -F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
 +F test/pragma.test fc0c3c0ca53ad82b32c02db7000c1c6ba4449fce
- F test/pragma2.test a8e11a7a38e2a5053fe4b807fc806c937d9a7469
+ F test/pragma2.test 1a4cc20b0cd8fc6411bd2f828cdc3ea1bdd570b9
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -1043,9 -1038,10 +1043,10 @@@ F test/spellfix.test 0597065ff57042df1f
  F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
  F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
  F test/sqllimits1.test 89b3d5aad05b99f707ee3786bdd4416dccf83304
 -F test/stat.test 8de91498c99f5298b303f70f1d1f3b9557af91bf
+ F test/sqllog.test a8faa2df39610a037dd372ed872d124260d32953
 +F test/stat.test d7607786af4054f277f6d48b2465f27b61f380f7
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1061,10 -1057,10 +1062,10 @@@ F test/table.test b708f3e5fa2542fa51dfa
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 91f8ab073600ead79f592b8e4634d8b1d4dd4a7e
 -F test/tester.tcl 87a4d4533f55c586bc17bca5b96d381a7fe328e0
++F test/tester.tcl 348d0226e44124ebedec2bc70218943fb3ba3567
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1280,33 -1276,33 +1281,33 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test b1d425f68a1f61d12563f0fa1ee6fca7d5afabf4
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
 +F test/wal.test cfbc6bbd2cc519f6cc5c01ae7744ef78785b0957
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
- F test/wal3.test d10d42349df5e42cc930c0a85932cb566dddcc34
++F test/wal3.test 80c314c403888c968bb80f3ce1be84f6e6ccfe2c
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test c7d532c76f9e16aec657e529184c52a6e834dae4
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 9902a3d84e9bc80357a2c54ed0e76c0d6d04a867
  F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1407,7 -1403,7 +1408,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 5429f99b98ea1e2ecf5f50dade52009adc431a12 f79d264db24a470d1a4571e15a99cd3d68b5166c
- R c9bab7d89b880c5e9e8651e2cdfa3e57
 -P cab8126be9f63dd596719b12704ba77c128282bc
 -R 285b415177be5b2cab525b82d9f69ae9
++P e72331c719375dcfcfaba160f00d26e5460e9230 9d532fb50d310df629ea65193f21dc9b3594ff5f
++R bbf3e08bf84f489af422fcab0ba25e4f
  U drh
- Z d3a734ab8d244dee8bcc5fe982e7b755
 -Z a7a38819a361f89adc4ae5f714679f1c
++Z 40ac7216e76c05963ea1ffb0b84595bb

diff --cc manifest.uuid
index 3e913f7d7039a3146d3fe948d37735cf66de5504,093fb4fd1fe65c27ee8597552c9f89b757cc5632..40cddd590e8ebfc8885023b7f0b54a6c941a053b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e72331c719375dcfcfaba160f00d26e5460e9230
 -9d532fb50d310df629ea65193f21dc9b3594ff5f
++178da33909ff8e524cdefeede40fa5bd908efb37

diff --cc src/main.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
index d983dd1c5a84b5a4025dcb35e7ab4658d3a50eab,4cb5c0057ad4a522382d062d2effc9deb8773e59..f1063f84fbc814160b8fd92148339ec12debc2f5
--- 1/src/test_config.c
--- 2/src/test_config.c
+++ b/src/test_config.c
@@@ -676,23 -656,13 +676,29 @@@ Tcl_SetVar2(interp, "sqlite_options", "
  #else
    Tcl_SetVar2(interp, "sqlite_options", "yytrackmaxstackdepth", "0", TCL_GLOBAL_ONLY);
  #endif
-   
+ 
+ #ifdef SQLITE_ENABLE_SQLLOG
+   Tcl_SetVar2(interp, "sqlite_options", "sqllog", "1", TCL_GLOBAL_ONLY);
+ #else
+   Tcl_SetVar2(interp, "sqlite_options", "sqllog", "0", TCL_GLOBAL_ONLY);
+ #endif
+ 
 +#ifdef __APPLE__
 +# if  defined(__ppc__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "ppc", TCL_GLOBAL_ONLY);
 +# elif defined(__i386__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "i386", TCL_GLOBAL_ONLY);
 +# elif defined(__x86_64__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "x86_64", TCL_GLOBAL_ONLY);
 +# elif defined(__arm__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "arm", TCL_GLOBAL_ONLY);
 +# else
 +#  error Unrecognized architecture for exec_options
 +# endif
 +#else
 +  Tcl_SetVar2(interp, "os_options", "arch", "unknown", TCL_GLOBAL_ONLY);
 +#endif
 +
  #define LINKVAR(x) { \
      static const int cv_ ## x = SQLITE_ ## x; \
      Tcl_LinkVar(interp, "SQLITE_" #x, (char *)&(cv_ ## x), \

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal3.test
Simple merge