Merge in all the latest trunk enhancements.

FossilOrigin-Name: 7f48f6ab2af071ec20204105ed703c60e9fa92602558b910d14b09cc634bed7d

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
index 6249bff0d24b28473db9a3c43f638231463edb84,da15cf6dbb843172f32c9ff48d00e8f0344a699c..81ca681e1836e310482afd9cd132112666fb78c1
--- 1/Makefile.msc
--- 2/Makefile.msc
+++ b/Makefile.msc
@@@ -1505,10 -1506,7 +1506,10 @@@ FUZZDATA = 
  # when the shell is not being dynamically linked.
  #
  !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
- SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4
+ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
 +# SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS5
 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
  !ENDIF
  
  # <<mark>>

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

diff --cc main.mk
Simple merge

diff --cc manifest
index d71e0839440f66bfb35fc67e2d1171b6faf3ce9b,b54eac96d315fd8e9135870a41bf6bd6c5fc4b00..b043cd0be6af343007f1162c80856ef09eb4c2ff
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\stest\scases\sin\swal2.test\sdue\sto\sthe\sfact\sthat\sDarwin\schecks\sto\ssee\sif\nthe\sSHM\sfile\sis\swritable\sbefore\sattempting\sto\sopen\sin\sread/write.
- D 2017-07-07T22:39:28.022
- F Makefile.in 227347646e289e3b016ebb7a391ad6ed4ab56525834d56d47d1a83b8d97d6989
 -C Basic\stest\scases\sfor\sPRAGMA\ssecure_delete=FAST.
 -D 2017-07-07T22:47:32.568
 -F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
++C Merge\sin\sall\sthe\slatest\strunk\senhancements.
++D 2017-07-07T22:58:12.527
++F Makefile.in 6a5340b1406306cb440817bc7d3c7f5f4a0913768353a12a5f73a5bb18d1c0ee
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc fb28c0304f8a14c5ce7d4bde9fea1c903f644b49e78ebd9976ab2a1f0eb8afb5
 -F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
++F Makefile.msc af537736e9c19305027c942143c39df6bf2ea38033cbecc83547f48df33933f0
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
  F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -234,7 -276,7 +276,7 @@@ F ext/misc/sha1.c 0b9e9b855354910d3ca46
  F ext/misc/shathree.c fa185d7aee0ad0aca5e091b4a2db7baff11796170e5793b5de99e511a13af448
  F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
  F ext/misc/spellfix.c a4723b6aff748a417b5091b68a46443265c40f0d
- F ext/misc/stmts.c 4aa554f671f6a55a52060437a0215a93d2e9f10f2fa66b0f7f65aa0576fc90bb
 -F ext/misc/stmt.c 619222bc1752a7a8412bda2d9b97337c4bc67a1ddee0efcba0eb6f439f25ce5a
++F ext/misc/stmt.c 619222bc1752a7a8412bda2d9b97337c4bc67a1ddee0efcba0eb6f439f25ce5a w ext/misc/stmts.c
  F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
  F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
  F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
@@@ -275,9 -317,9 +317,9 @@@ F ext/rbu/sqlite3rbu.c d1438580a451eebd
  F ext/rbu/sqlite3rbu.h fc25e1fcd99b5c6d32b1b5b1c73122632e873ac89bd0be9bf646db362b7ce02c
  F ext/rbu/test_rbu.c ec18cfc69a104309df23c359e3c80306c9a6bdd1d2c53c8b70ae158e9832dcd6
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 00dabe6ca21e3dd58f1fade447c39b8a36da381b1f4bfccf966f7835b943b9ae
 -F ext/rtree/rtree.c c5886d4ba7e7c66d0f9ee0b788d5532f8537ca04db19cec7f2f64dcf46e9be37
++F ext/rtree/rtree.c 970d4baceb9f2e73b5acee56308d57b90fa1c9b582f49489d2d8eee749784185
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test d5f0ba215b3bd1d05269ada86e74073b8445852aa0d33a63e10ec63a09c39473
+ F ext/rtree/rtree1.test d3a0c2951207f060ddf14f8e0018bf02228b112ef49bfcb4dc5dc4003362f3bc
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test 2cafe8265d1ff28f206fce88d114f208349df482
  F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
@@@ -333,7 -372,7 +375,7 @@@ F ext/userauth/userauth.c 3410be31283ab
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk c1eca02dc5500469a14320357534135f86bbcbb43b1ddad4bf70c235aacb37f1
 -F main.mk 0288de0e6b44c2fa709b354d4fab5bce423259cc1653c35305c6e50d23ec561a
++F main.mk 59ad360218ad6801cb3e4836f41e6f3e7a262282ed0353efec2eed816bcd72c7
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -352,13 -391,13 +394,13 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 388fd95a653004e9c6a8370a8a5dd9620f0d861a2231bf46d8563236444d74d2
 -F src/btree.c 79fb003347c47c74f8fda24f2fd332321da616771cd3d1b3258b739f569ec625
++F src/btree.c d8a9a8b6cbf9ddc2ae6f1aaea5d70381999012c15ac10f9314091fc703c3d7e9
  F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
- F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
- F src/build.c 88a8cdc11d1c081ed565aa3e795bdf9160f4556463b4c4555e9860b59dd80340
- F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
+ F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
+ F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f
+ F src/callback.c 8e14b60d1ed1c87c02cb5f121ecda99224f2aea6524a77ee6f72c9b5c7110f84
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c e9a6db1321c2353fe922533f202b85abb3084cdf569450abcabf55e21e104550
+ F src/ctime.c 928954802b1397d9fb1378c7eb702c94b4735bbab1d5793e21b6a77734f56a1b
  F src/date.c cc42a41c7422389860d40419a5e3bce5eaf6e7835c3ba2677751dc653550a5c7
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
  F src/delete.c 3213547e97b676c6fa79948b7a9ede4801ea04a01a2043241deafedf132ecf5d
@@@ -371,10 -410,10 +413,10 @@@ F src/hash.c a12580e143f10301ed5166ea49
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 974499a3999d339a4c1ba8ef129a988d9f136b3789e423808b38cdc19d28adbe
- F src/legacy.c b143b1fe422524cb29cb5ac907c8a44684333d75
+ F src/insert.c bb70abf32c7c926745eb550938db9132309584a667a44c2db0e5fa3207600391
 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
++F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde
  F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
- F src/main.c 5ea52d49432dabf9c472f549fcb6bb1b62ab54b1358218c3684ec1041a23382d
 -F src/main.c e36ab281dc7d08eacf8789459b06e34ea1272631a67489799d4303be81aa7c14
++F src/main.c 098db34b1dbe073f1955b0364975615d5fc0feed901d049d582cf86919ef90ae
  F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -393,34 -432,33 +435,34 @@@ F src/os.c c03b50496df5815e8f6d45bae440
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 -F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
 +F src/os_unix.c 4193a7dca757d090f566edb733e012af939b5f8cbf4da6d574121ff55dcc67c7
 +F src/os_win.c 85b19486054c8cd5c4117dea882d983ea065d16e
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c 14f6982c470c05b8e85575c69e9c1712010602e20400f8670d8699e21283e0e4
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 +F src/pager.c 6140d3ccfba4ce89d5a9f113d32bd0554bd4ab8c476bf5cf6651f9060f6bfb1d
 +F src/pager.h 32adb801774046224e87829fa74ce16ce31a9087
- F src/parse.y 0513387ce02fea97897d8caef82d45f347818593f24f1bdc48e0c530a8af122d
+ F src/parse.y 71bf06b02f567232deabe258641b03e833e93c4dee61a120765ad74c13e7faec
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
 -F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
 -F src/pragma.c 54e64a9d65e2c3b6ef11d4ca732c6abc8b67f5e886f222ffe2cbf3506c4efbd2
 +F src/pcache1.c 4d201a7ee865e9a0ddc214db4c997e44215fefa15c1b0ec53cee40e9ba7a9716
- F src/pragma.c 994ebf405c74f44b11ab0ad7113e4d8f26197e3961b5f70aaf7a8c00d4259874
- F src/pragma.h a8a949000214fefb6210330eed8ccbbb4f752619a9871f31b3dedd4a240277fd
- F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
++F src/pragma.c 8984481dfc902a0e2ff06eca4d442849f43ad0c27c1979d0c887653320d7cad6
+ F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
 -F src/prepare.c 4b84ae7458febe1df3e04ae62ba56abc851f771340e460d14426e6802c5615f4
++F src/prepare.c 59b758ceea714771ff342d70df7a91a26f93285b29ce739aba4cf5250dd790dc
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c adf3ef9843135b1383321ad751f16f5a40c3f37925154555a3e61653d2a954e8
+ F src/resolve.c 6aa1fb1212e601f65b983ee1215d69a591986c8f97a3805c425c625a53839539
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 35ccfae64cecfa843d54a5898c4ab7d6595ce03d147267fa5eecdc8eab39cd6a
- F src/shell.c 227b86f2bdd707d0a177a4805a5c0b0378ef8337ab1ad04f5d79dc479568735a
- F src/sqlite.h.in 9ef801165ef597f8a57aa19a892206f4d6ad6854796c45de77fe402671573076
+ F src/select.c c9f7b7196e196e93979665680d055a789938b8e025556097bf484b184c0dd576
+ F src/shell.c a7067f647aef4b81569bbfd025f4fd120a4e7576a647d2aad05028eb50e50e48
 -F src/sqlite.h.in c38c31f2a874af2b7d8443aba1fba3652d8ee75f60305d2512215cbe0fa0674a
++F src/sqlite.h.in 54053fe5839b296efbbc334f2b126681383ce63e6bd831ff4f53d7d63cba950d
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 7230b8d42dc095ed87420845160b745ba4f1f7b2601d512c644c95f4ab74b729
 -F src/sqliteInt.h 7a7cd6f682471cce4afe64216f71fd64c622712aeb9d947c33c38337a7cf19a9
++F src/sqliteInt.h 0697bcea9c8e147cb570a217a2945ba2227c6df53612e58b5858821ad0d94018
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c cbf6313f86400acdf7dbf55fcd218cd28d43110a1210967efbc4f250646f81c0
- F src/test1.c f6b80b80cba7a56b0eec0339828dddc7383a471f1e3998b3b33eee315b39853b
+ F src/tclsqlite.c 2c29b0b76e91edfd1b43bf135c32c8674710089197327682b6b7e6af88062c3d
 -F src/test1.c 1c0726cdf7389ed053a9b9aa0dc3c63f3b9bbc607a25decae6549682008510b3
++F src/test1.c a53c71785246134f46c96ae6be1b141929040690096dc9f6ca3593a0133fc3b2
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c b8434949dfb8aff8dfa082c8b592109e77844c2135ed3c492113839b6956255b
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -435,7 -473,7 +477,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c 075bd5db1e2a605bd7838d66512ac06d0184a2953457b50626cb6655f367cc03
 -F src/test_config.c abf6fc1fe9d041b699578c42e3db81f8831c4f5b804f1927958102ee8f2b773e
++F src/test_config.c 662b977daa3cd09ba7902d5ac00f206eeab5f4820ffb42d56a03d6dc5e4b306d
  F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
@@@ -477,25 -515,25 +519,25 @@@ F src/update.c c443935c652af9365e033f75
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
  F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
- F src/vdbe.c 992ca8b12473034027dfa0411e5266d257af58db470d6e84040dc62540f7d30d
- F src/vdbe.h 70a409d171d4e51b962f0d53abf15c33c404c6aa4c9d62fb3a931b5a62ba9615
- F src/vdbeInt.h cdcdabad4f5d6bf7a3beb826a7f33ee6f8f1cb220042bedd5b7d4bf2ea1d179f
- F src/vdbeapi.c aa587e3d860e8c4d9242fb7c57f0ba91967e939f734bb3979d71af6e5eca6d5c
- F src/vdbeaux.c bc9b3228f6d99bef0d0ecaf3a0e0e8358b3873242d0d2fe944226de3fdf9521e
 -F src/vdbe.c adc8a378710ec2376101483cc8a5f499539ee9bbebfb2a784f3370704d5d44ad
++F src/vdbe.c 2a79b738442ddecf31d08d650d23f343f4e7660242f95057ea6d94369a6b1896
+ F src/vdbe.h dde459b1e8a02b8445ecfd5959f38cd5ebb6b0ad392d491d8b159ac8193d231a
+ F src/vdbeInt.h 8dd7548d86a98b77b6ed910d8014d0e9e0666356b56f3d16ab7063aad4f102f5
 -F src/vdbeapi.c 899d8f021c89ab348708b3a9b00b855f5ecc3c0f949a75359a61a3c621021281
++F src/vdbeapi.c 5eed6c263d01ae60ed08359c31b22299ba15360299522cfbf39af3f84fd69156
+ F src/vdbeaux.c 6f01fe8a49b801cc7734ccfc61d1b782131ee3bb7ee28e336f3c73474800f8f9
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 94b17d851f31d4fd075d47d373d4b33ed3962a6ecb82cf385018025751091360
+ F src/vdbemem.c 8d78df62becfd2dce3c317f64b32a94ecaff8346d814bc8b0b877b38a1ad3718
  F src/vdbesort.c f512c68d0bf7e0105316a5594c4329358c8ee9cae3b25138df041d97516c0372
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c dad2233125cf918e8eced1ec9695525b9894cf7d
 +F src/wal.h 1598818fe90532a622ecdec5baa959f94e10062e
- F src/walker.c d46044e7a5842560dfe7122d93ff5145dd4a96f4d0bf5ba5910a7731b8c01e79
- F src/where.c 74b0a05487e44e8c5d28ebe3bd77ca9719b1d5114235bed48079aee309a0bb4e
+ F src/walker.c a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
+ F src/where.c e7cc80943459ade4ccaeb5c7c10f8a0db8b797e0b0f2509de7efc557b76bf7b6
  F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
- F src/wherecode.c 339ee802d9d311acf0cba8b5a9a092e167ef71c3a777d4b3e57de25d193251c7
- F src/whereexpr.c 837c4a74cd023553b914e244c361a92c868a8b848783f4ff2387ccd61b6ccbc9
+ F src/wherecode.c f17f5d51e372168db51af637e265aa5e80f99fcc81bfead96b66e71a7732bc62
+ F src/whereexpr.c fa51927cc6830b9d3155cafa4e589452ec023fe313a56550d2079dca6c52fbd8
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -691,19 -729,19 +733,19 @@@ F test/e_totalchanges.test b12ee5809d3e
  F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528
  F test/e_uri.test 25385396082b67fd02ae0038b95a3b3575fe0519
  F test/e_vacuum.test 1b8b4772d05374aa1b8958669138bbb4213ee26a
 -F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
 +F test/e_wal.test 95c21e45eefe4cc31e820f998b14f92d1cb3a1bf
  F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8
 -F test/e_walckpt.test 28c371a6bb5e5fe7f31679c1df1763a19d19e8a0
 +F test/e_walckpt.test 9f20ab843538484c57069074b126699266ee5521
- F test/e_walhook.test 4c0613a0c76e7a9d5c4c211e1b4cbcc1143914df
+ F test/e_walhook.test 01b494287ba9e60b70f6ebf3c6c62e0ffe01788e344a4846b08e5de0b344cb66
  F test/emptytable.test a38110becbdfa6325cd65cb588dca658cd885f62
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
  F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
  F test/enc3.test 6807f7a7740a00361ca8d0ccd66bc60c8dc5f2b6
  F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
  F test/eqp.test 3f9ba0b2594837c7beaa3ba824e2137cfe857308f020ec5a0c7a62b444e837b0
- F test/errmsg.test f31592a594b44ee121371d25ddd5d63497bb3401
+ F test/errmsg.test eae9f091eb39ce7e20305de45d8e5d115b68fa856fba4ea6757b6ca3705ff7f9
  F test/eval.test a64c9105d6ff163df7cf09d6ac29cdad5922078c
 -F test/exclusive.test 9a57bd66e39144b888ca75c309914fcdefb4e3f9
 +F test/exclusive.test ff85192dcf5000a1b53452a89fa9c5b61b0138cf
  F test/exclusive2.test 984090e8e9d1b331d2e8111daf6e5d61dda0bef7
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
  F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac
@@@ -1034,7 -1072,7 +1077,7 @@@ F test/pager1.test 15d423765637d8cd54b0
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
- F test/pagerfault.test 6b3f03fca89aacb4d1ca2c0216af114acaec0c66
 -F test/pagerfault.test 263c5442c06caf0b9b9e3fe42acdeb11f254dcebe533f69f401aaef9111eaf20
++F test/pagerfault.test 846f67b69457a5838c52c3a4a25817045a7f09225438e3582007a1c81f60016f
  F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
@@@ -1044,10 -1082,10 +1087,10 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 8aaa22a0f428a7e6b8446b97bc7691a273eaeff5dc290fb9129bf79fa9813a6e
- F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f
 -F test/pragma.test f274259d6393b6681eb433beb8dd39a26ec06a4431052a4880b43b84912a3f58
++F test/pragma.test 1ffae8826cf9514d9c9d67d4b293c1c93db9c864906351587350e56188e5dc25
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
 -F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
 +F test/pragma4.test 2fcabe7a352888f8aa70aad87eabe6481ea99b04
  F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 9e6db85f81c63f2367c34a9d7db384088bd374ad
@@@ -1138,10 -1176,10 +1181,10 @@@ F test/shell3.test 9b95ba643eaa228376f0
  F test/shell4.test 89ad573879a745974ff2df20ff97c5d6ffffbd5d
  F test/shell5.test 0d973866d0df8501486a840f51d1502ab0d9b38ca12c9b242ee26adc788af576
  F test/shell6.test ab1592ebe881371f651f18ee6a0df21cbfb5310f88cb832ab642d4038f679772
- F test/shell7.test 07751911b294698e0c5df67bcbd29e7d2f0f2907
+ F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
 +F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 8ab5d2c7c5cd3fe7f172d366e6e74e887cb33cb4
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
@@@ -1176,8 -1214,9 +1219,9 @@@ F test/sqllimits1.test a74ee2a3740b9f9c
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
  F test/stat.test f8f1279ffffabe6df825723af18cc6e0ae70a893
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 +F test/stmt.test fc832e52bd1273144abbb27c07fc01d1acdd9939
- F test/subjournal.test 2121a93ef3d3e83d52bf236c8a02aef4009fbf52884754104b2b6cad9a041095
+ F test/stmtvtab1.test 2a3cee496574ee9515e5e7a92fb8d9447903ccc14536a21545debeda267ff3c8
+ F test/subjournal.test 8d4e2572c0ee9a15549f0d8e40863161295107e52f07a3e8012a2e1fdd093c49
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test 0966aa8e720224dbd6a5e769a3ec2a723e332303
@@@ -1424,39 -1463,39 +1468,39 @@@ F test/vtabE.test d5024aa42754962f6bb0a
  F test/vtabF.test 1918844c7c902f6a16c8dacf1ec8f84886d6e78b
  F test/vtabH.test 26d54e8b5407f797638b787a55f9c88323850a58dd142de02d06b9a1159bd283
  F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
- F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
+ F test/vtab_alter.test 736e66fb5ec7b4fee58229aa3ada2f27ec58bc58c00edae4836890c3784c6783
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
 -F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test b602704e4b066199bc89d91ca9000f335dcf4572
 +F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
 +F test/wal2.test 62450517846a0ff7aa17249bc439586ade88d437e2e6c53479f9235ba0f5599f
 +F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
 +F test/wal6.test 3d9b79194d15f5b4f6e4169f89f815c049edb2df
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test 82bf6e493002b2d1580823b40e47bce3e15f468a
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test 018d4e5a3d45c6298d11b99f09a8ef6876527946
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test e322af729156c121183af4847c6e2b17bc629f47
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test bb234a1bb42248b3515d992b719708015c384278
 -F test/walcrash.test 21038858cc552077b0522f50b0fa87e38139306a
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 +F test/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
  F test/walcrash4.test e7b6e7639a950a0cca8e210e248c8dad4d63bf20
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
  F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test 0b92feb132ccebd855494d917d3f6c2d717ace20
 -F test/walro.test 4ab7ac01b77c2f894235c699d59e3e3c7f15a160
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walro.test b874ef49167c3a463f798a4caf25c7e13e1a9e7f
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test 478d2170637b9211f593120648858593bf2445a1
  F test/where3.test 54cdeb02157acc979de41530b804ae7b09552bf1
@@@ -1527,10 -1566,10 +1571,10 @@@ F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae5
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl bdd4c76449e9e0874ae7f0846868c42583e63b47a081b177a97f94e2b702b3e7
+ F tool/mkpragmatab.tcl 2144bc8550a6471a029db262a132d2df4b9e0db61b90398bf64f5b7b3f8d92cd
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
- F tool/mksqlite3c.tcl f02baa443e32175cde9b31ae1d1749b774a26e1e43391630ff5fe1b34c8c6c00
 -F tool/mksqlite3c.tcl f6214285bec900d28441366ca31af327aade18bbc424b0480497966ec05bc43c
++F tool/mksqlite3c.tcl 218b7c758339655856197bec2c0d6490963231c4e234a07233d1babd0a797184
  F tool/mksqlite3h.tcl 51bd5e7e840a920388a5966c9f2ccc618f434c57bd68c1bab4085b2553e1e237
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1589,7 -1628,7 +1633,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P d9d927814019f6c562eca198aca10f407aae423ea0a9f82c789298b77be8c187
- R 41b7dad15e3d9044aa4c397015793f31
 -P 12a421bcacf72128426eeafed8663accd8f2ac7edb46f620b60b8239065e657e
 -R e6f8feea678ffb081657c6bb012062fd
++P 6b618b18f7bac4c62d9907240f938cd8655d2b37056a6aaaf4012d62ded041d5 0c246017b45c5290f3a7932dfce649f1a6d8f9afc00c6c3edf2ef06c17dbca1d
++R 3c000ac934a3c3c875fecf313c669cf8
  U drh
- Z 21df9088f48dddb3277cdb9829938e35
 -Z c614413c179295441abb82c2446a03c8
++Z a2103a0b3c27e8b97a90d3fb694730ab

diff --cc manifest.uuid
index 8527c6ad93f37c972ad67505421722e5c456d597,855c66f415308f11206ba19b530061ef9942fffe..13a153901cf766a26cb05021db140c6bc2995d3d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6b618b18f7bac4c62d9907240f938cd8655d2b37056a6aaaf4012d62ded041d5
 -0c246017b45c5290f3a7932dfce649f1a6d8f9afc00c6c3edf2ef06c17dbca1d
++7f48f6ab2af071ec20204105ed703c60e9fa92602558b910d14b09cc634bed7d

diff --cc src/btree.c
Simple merge

diff --cc src/legacy.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/prepare.c
index 47dc483da17eb9e991529f0adc70ee84ea24d824,fb885101dfe2fd268f09483d5ac592e8ad0a0194..8a0457afb3cd02a3020bf0117686356eac7eea57
--- 1/src/prepare.c
--- 2/src/prepare.c
+++ b/src/prepare.c
@@@ -762,10 -765,23 +771,26 @@@ int sqlite3_prepare_v2
    const char **pzTail       /* OUT: End of parsed string */
  ){
    int rc;
-   rc = sqlite3LockAndPrepare(db,zSql,nBytes,1,0,ppStmt,pzTail);
+   rc = sqlite3LockAndPrepare(db,zSql,nBytes,SQLITE_PREPARE_SAVESQL,0,
+                              ppStmt,pzTail);
+   assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );  /* VERIFY: F13021 */
+   return rc;
+ }
+ int sqlite3_prepare_v3(
+   sqlite3 *db,              /* Database handle. */
+   const char *zSql,         /* UTF-8 encoded SQL statement. */
+   int nBytes,               /* Length of zSql in bytes. */
+   unsigned int prepFlags,   /* Zero or more SQLITE_PREPARE_* flags */
+   sqlite3_stmt **ppStmt,    /* OUT: A pointer to the prepared statement */
+   const char **pzTail       /* OUT: End of parsed string */
+ ){
+   int rc;
+   rc = sqlite3LockAndPrepare(db,zSql,nBytes,
+                  SQLITE_PREPARE_SAVESQL|(prepFlags&SQLITE_PREPARE_MASK),
+                  0,ppStmt,pzTail);
 +#ifdef SQLITE_ENABLE_SQLRR
 +  SRRecPrepare(db, zSql, nBytes, 1, *ppStmt);
 +#endif
    assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );  /* VERIFY: F13021 */
    return rc;
  }
@@@ -807,11 -823,9 +832,11 @@@ static int sqlite3Prepare16
    sqlite3_mutex_enter(db->mutex);
    zSql8 = sqlite3Utf16to8(db, zSql, nBytes, SQLITE_UTF16NATIVE);
    if( zSql8 ){
-     rc = sqlite3LockAndPrepare(db, zSql8, -1, saveSqlFlag, 0, ppStmt, &zTail8);
+     rc = sqlite3LockAndPrepare(db, zSql8, -1, prepFlags, 0, ppStmt, &zTail8);
    }
 -
 +#ifdef SQLITE_ENABLE_SQLRR
 +  SRRecPrepare(db, zSql8, -1, 1, *ppStmt);
 +#endif
    if( zTail8 && pzTail ){
      /* If sqlite3_prepare returns a tail pointer, we calculate the
      ** equivalent pointer into the UTF-16 string by counting the unicode

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
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/pagerfault.test
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge