Merge trunk enhancements into the apple-osx branch. Most tests works, but

there are yet a few issues to be resolved.

FossilOrigin-Name: da8646582a9a8c800ff2962d40ca215381d846dc

diff --cc Makefile.in
index dc7815aa7a15e3545f252c6690e18df00462617f,8f3d6f7dfe550d71e5ae1a78b5de02089a9ef5dd..ba0e6411624016b5fa17ad861315f095e29d0780
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -339,8 -345,8 +345,10 @@@ SRC += 
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
  SRC += \
-   $(TOP)/ext/sqlrr/sqlrr.c
 +  $(TOP)/ext/sqlrr/sqlrr.h \
++  $(TOP)/ext/sqlrr/sqlrr.c \
+   $(TOP)/ext/rbu/sqlite3rbu.h \
+   $(TOP)/ext/rbu/sqlite3rbu.c
  
  
  # Generated source code files
@@@ -511,18 -524,26 +526,37 @@@ EXTHDR += 
    $(TOP)/ext/icu/sqliteicu.h
  EXTHDR += \
    $(TOP)/ext/rtree/sqlite3rtree.h
 +EXTHDR += \
 +  $(TOP)/ext/sqlrr/sqlrr.h
 +
 +# If using the amalgamation, use sqlite3.c directly to build the test
 +# fixture.  Otherwise link against libsqlite3.la.  (This distinction is
 +# necessary because the test fixture requires non-API symbols which are
 +# hidden when the library is built via the amalgamation).
 +#
 +TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 +TESTFIXTURE_SRC1 = sqlite3.c
 +TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
  
+ # executables needed for testing
+ #
+ TESTPROGS = \
+   testfixture$(TEXE) \
+   sqlite3$(TEXE) \
+   sqlite3_analyzer$(TEXE) \
+   sqldiff$(TEXE)
+ 
+ # Databases containing fuzzer test cases
+ #
+ FUZZDATA = \
+   $(TOP)/test/fuzzdata1.db \
+   $(TOP)/test/fuzzdata2.db \
+   $(TOP)/test/fuzzdata3.db
+ 
+ # Standard options to testfixture
+ #
+ TESTOPTS = --verbose=file --output=test-out.txt
+ 
  # This is the default Makefile target.  The objects listed here
  # are what get build when you type just "make" with no arguments.
  #

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc main.mk
index eb8a08bd52fe93e426f0ad674bb9e4506420a534,9988fe2775031be43adbe1e091ae8c2bfc5c35ab..955da0ff3bd1eed2a562ba59cac80e60c49f60ef
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -217,11 -221,14 +221,16 @@@ SRC += 
    $(TOP)/ext/rtree/sqlite3rtree.h \
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
 +SRC += \
 +  $(TOP)/ext/sqlrr/sqlrr.c
  SRC += \
    $(TOP)/ext/userauth/userauth.c \
-   $(TOP)/ext/userauth/sqlite3userauth.h
+   $(TOP)/ext/userauth/sqlite3userauth.h 
+ 
+ SRC += \
+   $(TOP)/ext/rbu/sqlite3rbu.c \
+   $(TOP)/ext/rbu/sqlite3rbu.h
+ 
  
  # Generated source code files
  #
@@@ -373,7 -388,26 +390,11 @@@ HDR = 
  # Header files used by extensions
  #
  EXTHDR += \
 -  $(TOP)/ext/fts1/fts1.h \
 -  $(TOP)/ext/fts1/fts1_hash.h \
 -  $(TOP)/ext/fts1/fts1_tokenizer.h
 -EXTHDR += \
 -  $(TOP)/ext/fts2/fts2.h \
 -  $(TOP)/ext/fts2/fts2_hash.h \
 -  $(TOP)/ext/fts2/fts2_tokenizer.h
 -EXTHDR += \
 -  $(TOP)/ext/fts3/fts3.h \
 -  $(TOP)/ext/fts3/fts3Int.h \
 -  $(TOP)/ext/fts3/fts3_hash.h \
 -  $(TOP)/ext/fts3/fts3_tokenizer.h
 -EXTHDR += \
 -  $(TOP)/ext/rtree/rtree.h
 -EXTHDR += \
 -  $(TOP)/ext/icu/sqliteicu.h
 +  $(TOP)/ext/sqlrr/sqlrr.h
+ EXTHDR += \
+   $(TOP)/ext/fts5/fts5Int.h  \
+   fts5parse.h                \
+   $(TOP)/ext/fts5/fts5.h 
  EXTHDR += \
    $(TOP)/ext/userauth/sqlite3userauth.h
  

diff --cc manifest
index d9b48e52e18dacc09550d2e3add4bacde060b720,4c7e7c03468799561e6375154b1bea5ef972db8f..2b3035e9976e4a914f2b3e28a269ca8f0b5c1395
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sthe\sretry\smechanism\son\sfile\slocks.
- D 2015-08-11T18:18:24.400
 -C Fix\sthe\sOR-optimization\sso\sthat\sit\salways\signores\ssubplans\sthat\sdo\snot\nuse\san\sindex.
 -D 2015-08-27T23:18:55.309
++C Merge\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.\s\sMost\stests\sworks,\sbut\nthere\sare\syet\sa\sfew\sissues\sto\sbe\sresolved.
++D 2015-08-28T02:12:45.599
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 0dc7ac539680061505b2a3516299ae9a7e4595cd
 -F Makefile.in e2218eb228374422969de7b1680eda6864affcef
++F Makefile.in fbef0c6d0c4d58e7c0983d1c3a789bbe3b20dc81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc a19bceec468fa18bb54df52257b1a2211e69172d
+ F Makefile.msc 10af19cc089862481d49b347acd99c02635ddc49
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
- F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
- F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
+ F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
+ F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -123,8 -204,33 +204,33 @@@ F ext/misc/totype.c 4a167594e791abeed95
  F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
  F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
  F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
+ F ext/rbu/rbu.c e572f7ddef2ef3a73d03e7b44d36448e466772b7
+ F ext/rbu/rbu1.test 57601977588603e82700a43c279bd55282ffa482
+ F ext/rbu/rbu10.test 046b0980041d30700464a800bbf6733ed2df515d
+ F ext/rbu/rbu11.test 9bc68c2d3dbeb1720153626e3bd0466dcc017702
+ F ext/rbu/rbu12.test bde22ed0004dd5d1888c72a84ae407e574aeae16
+ F ext/rbu/rbu13.test 462ff799c4afedc3ef8a47ff818c0ffbf14ae4f2
+ F ext/rbu/rbu14.test 01f5dcba904aecadbaea69d4ccdc2ea43dd30560
+ F ext/rbu/rbu3.test 8bd4c6b87367c358981b6a47dc3d654fa60bff90
+ F ext/rbu/rbu5.test 2e24fee3e615aecd99bbdd46967935a641e866f7
+ F ext/rbu/rbu6.test 32e8ed60631b6facdb6366bd2b5f5f25245e7edb
+ F ext/rbu/rbu7.test fd025d5ba440fcfe151fbb0e3835e1e7fe964fa1
+ F ext/rbu/rbu8.test 3bbf2c35d71a843c463efe93946f14ad10c3ede0
+ F ext/rbu/rbu9.test 0806d1772c9f4981774ff028de6656e4183082af
+ F ext/rbu/rbuA.test c1a7b3e2d926b8f8448bb3b4ae787e314ee4b2b3
+ F ext/rbu/rbuB.test c25bc325b8072a766e56bb76c001866b405925c2
+ F ext/rbu/rbu_common.tcl 0398545fed614f807d5f0ba55a85a51f08ba8f1a
+ F ext/rbu/rbucrash.test 8d2ed5d4b05fef6c00c2a6b5f7ead71fa172a695
+ F ext/rbu/rbudiff.test 6cc806dc36389292f2a8f5842d0103721df4a07d
+ F ext/rbu/rbufault.test cc0be8d5d392d98b0c2d6a51be377ea989250a89
+ F ext/rbu/rbufault2.test 9a7f19edd6ea35c4c9f807d8a3db0a03a5670c06
+ F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda
+ F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
+ F ext/rbu/sqlite3rbu.c 1650e682b3568db0ed97ff2c7ba5d1c8ea060a84
+ F ext/rbu/sqlite3rbu.h 5357f070cd8c0bcad459b620651ec1656859e4d0
+ F ext/rbu/test_rbu.c 2a3652241fa45d5eaa141775e4ae68c1d3582c03
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c dd251a63b84ec8c368c335ee0ac2abb7ecf058fd
 -F ext/rtree/rtree.c 0f9b595bd0debcbedf1d7a63d0e0678d619e6c9c
++F ext/rtree/rtree.c 65a024af764c4ee608f039ee67e5bf009327b7bd
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -143,21 -249,18 +249,21 @@@ F ext/rtree/rtreeE.test 45a147a64a76306
  F ext/rtree/rtreeF.test 66deb9fd1611c7ca2e374adba63debdc2dbb12b4
  F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
  F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
- F ext/rtree/sqlite3rtree.h 83349d519fe5f518b3ea025d18dd1fe51b1684bd
+ F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 2dcfa4c8133f4a3aad763fd00d4cf39ee35a084a
 -F main.mk 04840e8277ab5159af16172eafd214dae7cffff5
++F main.mk bb8d31b53e1956ea7571bea3318217f0ca5c7544
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
- F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32
+ F mkopcodeh.awk 0e7f04a8eb90f92259e47d80110e4e98d7ce337a
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -169,37 -272,38 +275,38 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c d23d6b6991f66b383934f137fd4384d93fb98c81
- F src/analyze.c 91540f835163d5369ccbae78e2e6c74d0dd53c1d
- F src/attach.c c38ac5a520a231d5d0308fd7f2ad95191c867bae
+ F src/alter.c 48e14b8aea28dc58baafe3cfcb8889c086b7744a
+ F src/analyze.c f89727c36f997bd2bf6c5e546c2f51dc94e6f2a4
+ F src/attach.c e944d0052b577703b9b83aac1638452ff42a8395
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
- F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
+ F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
+ F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c d061b108bed81feeac24703a5b5a91153cabafb6
 -F src/btree.c f48b3ef91676c06a90a8832987ecef6b94c931ee
++F src/btree.c d82a50a60222073786f21d1f93dd95d5718f0659
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
- F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
- F src/build.c e246c2cea69c8f6fc825a156ea2de9dd4a17f18b
+ F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
+ F src/build.c 97f682229876834abad515a0a48759a967999ed0
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
- F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
- F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
- F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
- F src/delete.c 37964e6c1d73ff49cbea9ff690c9605fb15f600e
- F src/expr.c 5555f768c05d7d4a7840c6c2e72ad7aecbe0fe54
+ F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
+ F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
+ F src/date.c 8ec787fed4929d8ccdf6b1bc360fccc3e1d2ca58
 -F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
++F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a w src/test_stat.c
+ F src/delete.c 813be7b5659d7658c8a71b5ae194b45c8f739c8b
+ F src/expr.c 5944e529891416f482250e16c598d8c26e149eb0
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 3343d551a8d810782257244fb33f2ce191493c39
- F src/func.c 1414c24c873c48796ad45942257a179a423ba42f
- F src/global.c 4f77cadbc5427d00139ba43d0f3979804cbb700e
+ F src/fkey.c 3ce33dd49f12c72376cec9adc7a4d8e7111cedcc
+ F src/func.c 824bea430d3a2b7dbc62806ad54da8fdb8ed9e3f
+ F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c b152e71457c40a3967ceafa9e7cbbb52e9ead2c1
+ F src/insert.c c31b9253f0d40425d012701ba6e7e4b28c1676ea
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
- F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
- F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c a5e55e2b1849352de79260ad277f8ffeb0c4b76e
- F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
+ F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
+ F src/loadext.c dfcee8c7c032cd0fd55af3e0fc1fcfb01e426df2
 -F src/main.c e17fcffae4306a9b8334faf3bac80d7396850b54
++F src/main.c d3fd6de724a28d6f3256a675c1234a685f5e4355
+ F src/malloc.c 19461e159bccf0e2cf06a50e867963d0a7b124a8
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -207,44 -311,43 +314,44 @@@ F src/mem3.c 61c9d47b792908c532ca3a62b9
  F src/mem5.c 61eeb90134f9a5be6c2e68d8daae7628b25953fb
  F src/memjournal.c 3eb2c0b51adbd869cb6a44780323f05fa904dc85
  F src/msvc.h d9ba56c6851227ab44b3f228a35f3f5772296495
- F src/mutex.c 19bf9acba69ca2f367c3761080f8a9f0cf4670a8
+ F src/mutex.c 529e95739f815300a33c73fd8a7d6bdf0c24bd18
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
- F src/mutex_noop.c 529bab0743c3321c940f32c3464de494fd38cfa9
- F src/mutex_unix.c 5cf676464bd19e0a866297515d146e8bf1669dfb
- F src/mutex_w32.c 61660ada28d8308ad190f444c2170c4f2a590c2f
+ F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
+ F src/mutex_unix.c b0d280089df0f49545f1318f45d61d07d2f674a8
+ F src/mutex_w32.c b601f9e3073f7bd2c1f42a8c0ce59e42d6a08f85
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 -F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 +F src/os.c 5822c2b843a77219bba1e28887cdc816b27ca29d
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
- F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
+ F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c bc57de77a1317cb613e31898bfd6667ec41b39ed
- F src/os_win.c 93f8662844dc935280a1851d15c823f1e6857408
 -F src/os_unix.c 388c023582b17890f10c980b30ec1922b471753b
 -F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a
++F src/os_unix.c 70dc7e3ac3227b1f129ec08538c095a3f3dbc909
++F src/os_win.c 8a586f1f7e829e361a41a45fd6cf6a7cc44e7314
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
- F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
- F src/parse.y c4e0387bc88c8e21e5ba653e2578959a1f3cdbc7
- F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
- F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
- F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
- F src/pragma.c 17e0049780fee7594233d627ad8da19a81a335c7
- F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
- F src/prepare.c 5be49833da7f82806a4957cb91ad4e8f2453808f
- F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
 -F src/pager.c aa916ca28606ccf4b6877dfc2b643ccbca86589f
 -F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
++F src/pager.c 4e202d93e77cfc8f316a99b5b8b0cd11bc65eb32
++F src/pager.h c2471a089cd23dc7e0a9aebb8800ccfd693928a1
+ F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
+ F src/pcache.c cde06aa50962595e412d497e22fd2e07878ba1f0
+ F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
+ F src/pcache1.c a3fe31b17e841ec70beee72a2c960e9c787a8857
 -F src/pragma.c a239d2c8c6d87d589927547f234b0f6259c69f62
++F src/pragma.c 9eaa576bbe497290042ed0ddae0a0357fbb30021
+ F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
++F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
+ F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 53486a98c17b7ae09b8c2b398013e973ce4c1aae
+ F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 217d181aaf31e12c4a94905dd12c21e1ca76c67d
- F src/shell.c 28b3e1174a7fc00155d7d00880a33589a88508c9
- F src/sqlite.h.in a57fba23bfa1b17e60e6bd682f9614ab59272390
+ F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105
+ F src/shell.c b1f91e60918df3a68efad1e3a11696b9a7e23d23
 -F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
++F src/sqlite.h.in 2dc1df9ca9e551aa54f3cd9ca65273e879cc832d
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 892e58b816cb9588e4ff0e39628372b628a3e1cf
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212
+ F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
++F src/sqliteInt.h 680a0371a53bf46a2ad795e4ef3ccf2df702a1b8
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
- F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c fa72a7c5278662357c105ba7925c1d0972506ff9
- F src/test1.c 1fe65ec71cf2eae982c70cf80127d502d46bb341
+ F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
+ F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 -F src/test1.c c96508c835979bf15dc0e3146e2c7a51a2333d3c
++F src/test1.c 3c225fcd7e95e81d8733ce9414ca793b8bc4703c
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
  F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -256,9 -359,9 +363,9 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09
+ F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 8164cfbd9c659ba68490b4b69cb360ffdb4780a1
 -F src/test_config.c fb2e5d354d9a077f5fbb261652eff4787deb104f
++F src/test_config.c 19a28baf2cfa5adc7c8f77f788f4a1452170a49a
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -282,8 -385,7 +389,7 @@@ F src/test_rtree.c 43fff4c5a01576d6d213
  F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
  F src/test_sqllog.c b690c12933f50ff46491e0d56a251f84ae16e914
- F src/test_stat.c ffc8177f6e69de32a8a89fa6bca73facb6c5face
 -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
@@@ -291,29 -393,33 +397,33 @@@ F src/test_vfs.c 3b65d42e18b262805716bd
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
- F src/tokenize.c b7fb584c2be5ec39b6fdf04b185e7c6f33f8dc15
- F src/trigger.c bc647c712454c9b209fac082bb82870b5fd6fa54
- F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
+ F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
+ F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
+ F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
+ F src/update.c adc8b4b2b6fd2cca2e0d2b803e0cf6956aa3a030
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
- F src/util.c a6431c92803b975b7322724a7b433e538d243539
+ F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 32e165d7a3b701ad7ec251176dc64a357740d8f8
- F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
- F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
- F src/vdbeapi.c 36861a49fcb11325e2fce937418b06ce1e3de1a8
- F src/vdbeaux.c 85b76767552077c3f4d169cefb74833bc60cdb1a
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
++F src/vdbe.c 30e368a0eea028063fd257220dd3ede860b67412
+ F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
+ F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
 -F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
 -F src/vdbeaux.c af2d86b2b114a106c94fc656503fc5c89594f5af
++F src/vdbeapi.c 0a32d5892d78b4d9b58d4756575eac15bd585579
++F src/vdbeaux.c feb3bec607e417059b839a55cf1b96792f8019bd
  F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
- F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
- F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
- F src/vdbetrace.c f95c2dff9041fcf07f871789c22ebb0648ea0b7c
- F src/vtab.c 5f81f8a59c1f5ddb94c918f25ed5d83578fcc633
+ F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
+ F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
+ F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
+ F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c de15f46df1161b925a9a509b39bc750f1951cdd7
 -F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c 22a901a0af4bf896ae4053023b1fe881e67f71a7
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
- F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
- F src/where.c 8ba8ff31dc9bf1b69fe771d35d8764d5a1efd310
- F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c
+ F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
+ F src/where.c 91e73ffc699c140a59baa03a6b7b060db02bed81
+ F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
+ F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5
+ F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
+ F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -505,10 -613,11 +617,11 @@@ F test/exec.test e949714dc127eaa5ecc7d7
  F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
  F test/expr.test 79c3e7502d9e571553b85f0ecc8ff2ac7d0e4931
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
+ F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
- F test/filectrl.test 14fa712e42c4cb791e09dfd58a6a03efb47ef13a
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
+ F test/filectrl.test 7c13f96457435238da99aff7343ad6a3a4885787
  F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
- F test/fkey1.test e1d1fa84cde579185ea01358436839703e415a5b
+ F test/fkey1.test de5b287f6a480b36bd51e8debcf48168e26e4ed2
  F test/fkey2.test f3d27ecba480a348c328965d154214719bb158a9
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
  F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
@@@ -691,10 -806,11 +810,11 @@@ F test/join5.test 8a5c0be6f0c260a5c7177
  F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
  F test/journal1.test 69abc726c51b4a0409189f9a85191205297c0577
  F test/journal2.test ae06f566c28552c313ded3fee79a6c69e6d049b1
 -F test/journal3.test ff8af941f9e06161d3db1b46bb9f965ff0e7f307
 +F test/journal3.test ef775301aa8c64c80efa859e6aa0207add921a93
- F test/jrnlmode.test 9ee3a78f53d52cca737db69293d15dc41c0cbd36
+ F test/jrnlmode.test 7864d59cf7f6e552b9b99ba0f38acd167edc10fa
  F test/jrnlmode2.test 81610545a4e6ed239ea8fa661891893385e23a1d
  F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
+ F test/json101.test 950ed4e8deb8ad4c10bd4fbc858eb54143de9867
  F test/keyword1.test 37ef6bba5d2ed5b07ecdd6810571de2956599dff
  F test/lastinsert.test 42e948fd6442f07d60acbd15d33fb86473e0ef63
  F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
@@@ -708,18 -824,17 +828,18 @@@ F test/lock.test b984ab9034e7389be0d863
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
 -F test/lock5.test c6c5e0ebcb21c61a572870cc86c0cb9f14cede38
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test 1f1e0fd1670deef8c0a76e8f895bd5e124133ca4
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
  F test/lock_common.tcl 7ffb45accf6ee91c736df9bafe0806a44358f035
- F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
 -F test/main.test 16131264ea0c2b93b95201f0c92958e85f2ba11a
+ F test/lookaside.test 90052e87282de256d613fcf8c9cbb845e4001d2f
 +F test/main.test 3595944ab7fbb3637a499d3eff2b60c89e26adbb
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
- F test/malloc.test 96939d2d1a6f39667bbebe5bc27c6525f2ab614e
+ F test/malloc.test 21c213365f2cca95ab2d7dc078dc8525f96065f8
  F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
  F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
- F test/malloc5.test 79182b8bffd6d62f77b1a5a8ba8e6bf0e5053b8e
+ F test/malloc5.test 02ed7c5313f0a68d95f2dfca8c8962132bd1f04b
  F test/malloc6.test 2f039d9821927eacae43e1831f815e157659a151
  F test/malloc7.test 7c68a32942858bc715284856c5507446bba88c3a
  F test/malloc8.test 9b7a3f8cb9cf0b12fff566e80a980b1767bd961d
@@@ -737,13 -852,13 +857,13 @@@ F test/mallocI.test a88c2b9627c8506bf47
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  F test/mallocK.test da01dcdd316767b8356741f8d33a23a06a23def5
  F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
- F test/malloc_common.tcl c34d5b7f337336a7f2e30a197f1cf2646dbe8e76
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
++F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
- F test/memdb.test da09b7f354f3dc0b74d992f5451ae03ebfb36920
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
++F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
- F test/memsubsys1.test ab9e5d4268f19d08ee06fdd9b3b5c678083224e7
- F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
 -F test/memsubsys1.test d2b2d6ca37890b26703a2258df8fd66f9869da02
++F test/memsubsys1.test 6e741378471c2e3a615782fd8923d99ac3a2c002
+ F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
  F test/minmax3.test cc1e8b010136db0d01a6f2a29ba5a9f321034354
@@@ -784,9 -899,10 +904,10 @@@ F test/orderby5.test 8f08a54836d21fb7c7
  F test/orderby6.test 8b38138ab0972588240b3fca0985d2e400432859
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
  F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
+ F test/orderby9.test 88a330ea5fc7bed7e407b28beb0d2b79485ae2cc
  F test/oserror.test 14fec2796c2b6fe431c7823750e8a18a761176d7
  F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
 -F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
 +F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -794,13 -910,14 +915,14 @@@ F test/pagerfault.test 3ae5dafba16772a2
  F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
- F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
- F test/pcache.test 488061b5dd685df2234d690370285c9b4813377b
- F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
+ F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
+ F test/parser1.test 222b5cbf3e2e659fec1bf7d723488c8b9c94f1d0
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
++F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
+ F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
+ F test/permutations.test ac3b00c299250cc087d4a527b5c75a0f8aef4e54
 -F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2
 +F test/pragma.test 69cc5c349f86bd06ca52f73c501ff1cee940126f
- F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028
+ F test/pragma2.test 8e72df3a16c0fda748ad52abf79cb8256b04a6fe
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@@ -858,10 -977,10 +982,10 @@@ F test/selectE.test a8730ca330fcf40ace1
  F test/selectF.test 21c94e6438f76537b72532fa9fd4710cdd455fc3
  F test/selectG.test e8600e379589e85e9fefd2fe4d44a4cdd63f6982
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 -F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
 +F test/shared.test 13376ba3be1c5685ab1ec184189adabd15fa70be
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108
- F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
+ F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
  F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
  F test/shared7.test a81e99f83e6c51b02ac99c96fb3a2a7b5978c956
  F test/shared8.test 00a07bf5e1337ecf72e94542bdefdc330d7a2538
@@@ -877,9 -996,9 +1001,9 @@@ F test/shell4.test ddf0a99044e2245a87fc
  F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
- F test/shrink.test ce0f6f3f99ed0154a6ca04dc135d35a3fddf9455
 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
++F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
- F test/skipscan1.test 2ddfe5d168462170c4487f534e2a99fb006b2076
+ F test/skipscan1.test d37a75b4be4eb9dedeb69b4f38b1d0a74b5021d7
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
  F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
  F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
@@@ -900,12 -1019,15 +1024,15 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
- F test/speedtest1.c 2b416dca3a155fcaa849540b2e7fc1df12896c23
- F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
+ F test/speedtest1.c 857439869d1cb4db35e1c720ee9c2756eb9ea2a0
+ F test/spellfix.test 0597065ff57042df1f138e6a2611ae19c2698135
+ F test/spellfix2.test e5f2bc1dae046dbdd8008f2a84ed7749ff9b325e
+ F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
  F test/sqllimits1.test e05786eaed7950ff6a2d00031d001d8a26131e68
- F test/stat.test 1e5faf39649a0bb368770f780f926847520ea3f4
 -F test/stat.test 8de91498c99f5298b303f70f1d1f3b9557af91bf
++F test/stat.test d7607786af4054f277f6d48b2465f27b61f380f7
+ F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
- F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9
+ F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
@@@ -917,10 -1040,10 +1045,10 @@@ F test/table.test 33bf0d1fd07f304582695
  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 a173ad0b6bedc17b5f0445af9ff302bff4885ced
 -F test/tester.tcl 83cc29c89259490b25d2d7e47535d6f2ed5a57c7
++F test/tester.tcl 91f8ab073600ead79f592b8e4634d8b1d4dd4a7e
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1136,37 -1259,37 +1264,37 @@@ 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 0ae504805b7e41b64a55fb5b7745de5ca2a0db2a
 -F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test 2b5445e5da44780b9b44712f5a38523f7aeb0941
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 527581f5527bf9c24394991e2be83000aace5f9e
++F test/wal.test cfbc6bbd2cc519f6cc5c01ae7744ef78785b0957
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
- F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
++F test/wal3.test d7d2f20a26f0277b22f96cd631cd13d23e0545c9
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test 54ac71d59046014c70ad78957139984c5bfb7eb2
  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 28b64e93428961b07b0d486778d63fd672948f6b
- F test/where2.test 23fdb5d8e756554aad4ca7ae03de9dd8367a2c6e
+ F test/where.test 1ff3d9f8da0a6c0dc5ccfd38d9225b2cdb5b6afb
+ F test/where2.test af78c55589cbc82d793449493adba0dc3d659f23
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
- F test/where4.test d8420ceeb8323a41ceff1f1841fc528e824e1ecf
+ F test/where4.test 68aa5ad796e33816db2078bc0f6de719c7a0e21f
  F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
  F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
  F test/where7.test 5a4b0abc207d71da4deecd734ad8579e8dd40aa8
@@@ -1218,13 -1342,13 +1347,13 @@@ F tool/logest.c eef612f8adf4d0993dafed0
  F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
+ F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
- F tool/mksqlite3c.tcl 47a4ff09831066e5f0f1bf7db6b9e900ad7c4a84
+ F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl 421ecbd437d8cd7123e67430ee8146218396680d
++F tool/mksqlite3c.tcl ab34708fd680cca4187710899221a79b6d235d54
  F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
- F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
+ F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1254,9 -1378,9 +1383,9 @@@ F tool/varint.c 5d94cb5003db9dbbcbcc5df
  F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
+ F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 74b7bf17446bc21a73fa5b75c2942b5660b0ad7e
- R 0cb9b5a75b63fcc8106511860d2fb929
 -P cbc3c9a8bf169ae0b21f26855038502c6cc25cfe
 -R 3aef897e420a61a50263b8e461848e83
++P 600df309fc547db3dc21cfc41609eb3dcaa67273 66f92a16866e5825363636b9cc4b8f9b29d9e84d
++R 65de7830a3af5a82f4e8e422a3fc6f4d
  U drh
- Z 1b4c808f8bf036ac70f368df20dfe359
 -Z b614bfef572643d9445d8b8a4d103409
++Z 5c887a626f3ea4b7f5813551ec6019f5

diff --cc manifest.uuid
index 2c4d2fcb8588b82d29f49d59b604ad31a7f8f936,a3b504350e35a8ed7ec7f75c9e51573bec2fc823..d9d4dbf6757a3a38ee695a40f4f9cea9e62768bd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 600df309fc547db3dc21cfc41609eb3dcaa67273
 -66f92a16866e5825363636b9cc4b8f9b29d9e84d
++da8646582a9a8c800ff2962d40ca215381d846dc

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
index 77b13245df1a84f4230930194c4990ef8750ae7e,2c0034cf64d1ff31924eddfe91879f0e038065bd..4dfe57a5901212c2490e407a6475303cd9192231
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -570,7 -571,7 +571,8 @@@ int sqlite3VdbeExec
      ** sqlite3_column_text16() failed.  */
      goto no_mem;
    }
-   assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY || ((p->rc&0xFF) == SQLITE_LOCKED));
 -  assert( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_BUSY );
++  assert( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_BUSY
++            || (p->rc&0xFF)==SQLITE_LOCKED );
    assert( p->bIsReader || p->readOnly!=0 );
    p->rc = SQLITE_OK;
    p->iCurrentTime = 0;

diff --cc src/vdbeapi.c
index 580842ce3a4ca322d834125ff6e8cbc76af46771,15a8bba0d4ea75a89d262c917f9fde44a32dc09d..ff6d6874cdb01c2fdd75e0cf9c0f9642ff4e017e
--- 1/src/vdbeapi.c
--- 2/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@@ -100,15 -120,14 +126,17 @@@ int sqlite3_reset(sqlite3_stmt *pStmt)
      rc = SQLITE_OK;
    }else{
      Vdbe *v = (Vdbe*)pStmt;
-     sqlite3_mutex_enter(v->db->mutex);
+     sqlite3 *db = v->db;
 +#ifdef SQLITE_ENABLE_SQLRR
 +    SRRecReset(pStmt);
 +#endif
+     sqlite3_mutex_enter(db->mutex);
+     checkProfileCallback(db, v);
      rc = sqlite3VdbeReset(v);
      sqlite3VdbeRewind(v);
-     assert( (rc & (v->db->errMask))==rc );
-     rc = sqlite3ApiExit(v->db, rc);
-     sqlite3_mutex_leave(v->db->mutex);
+     assert( (rc & (db->errMask))==rc );
+     rc = sqlite3ApiExit(db, rc);
+     sqlite3_mutex_leave(db->mutex);
    }
    return rc;
  }

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/malloc_common.tcl
Simple merge

diff --cc test/memdb.test
index d1834bccad18c5a2c422626e67c7e565348a3803,7bad26f526b5e13315a9494cd5016c108d0d8d72..700aec5a1bd2a92d2eadf4ad94bee338d81fca5e
--- 1/test/memdb.test
--- 2/test/memdb.test
+++ b/test/memdb.test
@@@ -406,27 -407,23 +406,26 @@@ do_test memdb-8.2 
  
  # Test that auto-vacuum works with in-memory databases.
  # 
 -ifcapable autovacuum {
 -  do_test memdb-9.1 {
 -    db close
 -    sqlite3 db test.db
 -    db cache size 0
 -    execsql {
 -      PRAGMA auto_vacuum = full;
 -      CREATE TABLE t1(a);
 -      INSERT INTO t1 VALUES(randstr(1000,1000));
 -      INSERT INTO t1 VALUES(randstr(1000,1000));
 -      INSERT INTO t1 VALUES(randstr(1000,1000));
 -    }
 -    set before [db one {PRAGMA page_count}]
 -    execsql { DELETE FROM t1 }
 -    set after [db one {PRAGMA page_count}]
 -    expr {$before>$after}
 -  } {1}
 +set msize [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0]
 +if {[lindex $msize 2]!=0} {
 +  ifcapable autovacuum {
 +    do_test memdb-9.1 {
 +      db close
 +      sqlite3 db test.db
 +      db cache size 0
 +      execsql {
 +        PRAGMA auto_vacuum = full;
 +        CREATE TABLE t1(a);
 +        INSERT INTO t1 VALUES(randstr(1000,1000));
 +        INSERT INTO t1 VALUES(randstr(1000,1000));
 +        INSERT INTO t1 VALUES(randstr(1000,1000));
 +      }
-       set memused [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
-       set pgovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 1]
++      set before [db one {PRAGMA page_count}]
 +      execsql { DELETE FROM t1 }
-       set memused2 [lindex [sqlite3_status SQLITE_STATUS_MEMORY_USED 0] 1]
-       expr {($memused2 + 2048 < $memused) || $pgovfl==0}
++      set after [db one {PRAGMA page_count}]
++      expr {$before>$after}
 +    } {1}
 +  }
  }
  
  } ;# ifcapable memorydb

diff --cc test/memsubsys1.test
index e649f605a7d86d2796b40918d861288ee509869e,8265ce63174d1ebd8cd23368d9e671902f15cf74..0d3d40626494fad499bb53aa2b8b13cd02257ff1
--- 1/test/memsubsys1.test
--- 2/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@@ -120,21 -122,18 +124,20 @@@ sqlite3_config singlethrea
  sqlite3_initialize
  reset_highwater_marks
  build_test_db memsubsys1-3.1 {PRAGMA page_size=1024}
- #show_memstats
 -do_test memsubsys1-3.1.3 {
 -  set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
 -} 0
 -do_test memsubsys1-3.1.4 {
 -  set overflow [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
 -  # Note:  The measured PAGECACHE_OVERFLOW is amount malloc() returns, not what
 -  # was requested.  System malloc() implementations might (arbitrarily) return
 -  # slightly different oversize buffers, which can result in slightly different
 -  # PAGECACHE_OVERFLOW sizes between consecutive runs.  So we cannot do an
 -  # exact comparison.  Simply verify that the amount is within 5%.
 -  expr {$overflow>=$max_pagecache*0.95 && $overflow<=$max_pagecache*1.05}
 -} 1
 +if !$::sqlite_options(enable_purgeable_pcache) {
 +  do_test memsubsys1-3.1.3 {
 +    set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
 +  } 0
 +  do_test memsubsys1-3.1.4 {
 +    set overflow [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
 +    # Note: The measured PAGECACHE_OVERFLOW is amount malloc() returns, not what
 +    # was requested.  System malloc() implementations might (arbitrarily) return
 +    # slightly different oversize buffers, which can result in different
 +    # PAGECACHE_OVERFLOW sizes between consecutive runs.  So we cannot do an
 +    # exact comparison.  Simply verify that the amount is within 5%.
 +    expr {$overflow>=$max_pagecache*0.95 && $overflow<=$max_pagecache*1.05}
 +  } 1
 +}
  do_test memsubsys1-3.1.5 {
    set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
  } 0

diff --cc test/pcache.test
Simple merge

diff --cc test/shrink.test
index 40258cc5672ace8192be05cc98182d6f004633b4,7c9bed08b08cef2a7dea35e4042bb5cecea24cbf..f6820975ad25d94465e60a9175db0963b1946a55
--- 1/test/shrink.test
--- 2/test/shrink.test
+++ b/test/shrink.test
@@@ -15,12 -15,8 +15,13 @@@
  
  set testdir [file dirname $argv0]
  source $testdir/tester.tcl
+ test_set_config_pagecache 0 0
  
 +# purgeable pcache tracks memory differently
 +ifcapable {enable_purgeable_pcache} {
 +  finish_test
 +  return
 +}
  unset -nocomplain baseline
  do_test shrink-1.1 {
    db eval {

diff --cc test/stat.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal.test
index 92f64fc8652d0d2aed4fc4b421330a6b2a7a2ab7,bfe3634577b753272fe28b4aebc58b696e1c3593..11b5c4e83164169f1b0b72b79bea7a9121fb3892
--- 1/test/wal.test
--- 2/test/wal.test
+++ b/test/wal.test
@@@ -22,10 -22,7 +22,11 @@@ source $testdir/wal_common.tc
  set testprefix wal
  
  ifcapable !wal {finish_test ; return }
 +if { ![wal_is_ok] } {
 +  finish_test 
 +  return 
 +}
+ test_set_config_pagecache 0 0
  
  proc reopen_db {} {
    catch { db close }

diff --cc test/wal3.test
Simple merge

diff --cc tool/mksqlite3c.tcl
index 90607e9a32d34a2c38e857a334bf8ac95513fd08,e52b036612a1cfcd5553910ddb892d05373f3ddb..bc37c8707519a0e1aeaafd94aab516b16f8b050a
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -367,7 -376,8 +377,9 @@@ foreach file 
     rtree.c
     icu.c
     fts3_icu.c
 +   sqlrr.c
+    sqlite3rbu.c
+    dbstat.c
  } {
    copy_file tsrc/$file
  }