Merge all the latest fixes and enhancements from trunk.

FossilOrigin-Name: e181225dc7873f6ddfc49393d76becba7040823365326558447dbc6d177ccc2e

diff --cc Makefile.in
Simple merge

diff --cc manifest
index b043cd0be6af343007f1162c80856ef09eb4c2ff,8e74bf2aaf113038360c04f6ef908098305160dd..2e264ad7e67df08d42718bbbbd646a1f1ba677b3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sin\sall\sthe\slatest\strunk\senhancements.
- D 2017-07-07T22:58:12.527
- F Makefile.in 6a5340b1406306cb440817bc7d3c7f5f4a0913768353a12a5f73a5bb18d1c0ee
 -C Merge\sall\schanges\sfrom\sbranch-3.20.\s\sImprovements\sto\sthe\sfts5()\sextension\ninterface.\s\sWork\saround\sa\sgcc/valgrind\sbug\sin\sthe\ssqlite3_value_pointer()\ninterface.
 -D 2017-07-17T18:45:23.910
 -F Makefile.in eda8bedf08c4c93e2137ef1218b3d3302488c68c2774918de0335a1133aab157
++C Merge\sall\sthe\slatest\sfixes\sand\senhancements\sfrom\strunk.
++D 2017-07-17T20:21:24.884
++F Makefile.in 75047f6a0cd48fa8d47aef98e63ce25622235358abf40ed91bc622716b5b45df
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
 +F Makefile.msc af537736e9c19305027c942143c39df6bf2ea38033cbecc83547f48df33933f0
- F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
+ F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
  F VERSION 87f1498f27e398bce3da2fa8125c9879a38ed9d87e4b5fb922b351de1e25cadb
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -394,7 -394,7 +397,7 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c d8a9a8b6cbf9ddc2ae6f1aaea5d70381999012c15ac10f9314091fc703c3d7e9
 -F src/btree.c f55ea8f456d103328d61076be40fa39acbfea05eaa4eccfed275532a63c867c4
++F src/btree.c 155f59dcd4f2042fd610ab59bcb4ebca9970e00eff11028430527bfda30dd06e
  F src/btree.h 3edc5329bc59534d2d15b4f069a9f54b779a7e51289e98fa481ae3c0e526a5ca
  F src/btreeInt.h 97700795edf8a43245720414798b7b29d8e465aef46bf301ffacd431910c0da1
  F src/build.c 74108007d286232fb4290464ee5452fa860c26215f8caa0e6c7cbf69a6fafe8f
@@@ -414,9 -414,9 +417,9 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c bb70abf32c7c926745eb550938db9132309584a667a44c2db0e5fa3207600391
 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e
 +F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde
- F src/loadext.c a72909474dadce771d3669bf84bf689424f6f87d471fee898589c3ef9b2acfd9
- F src/main.c 098db34b1dbe073f1955b0364975615d5fc0feed901d049d582cf86919ef90ae
+ F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2
 -F src/main.c 3a9da9e3974d8a32ef6ca15b75503d540af22d284beb75bc7f0d93254ca3f8f7
++F src/main.c 552b85860aa37e015c120efe9e7ff682e1c637042532b4cf5a47d920c8d5a547
  F src/malloc.c e20bb2b48abec52d3faf01cce12e8b4f95973755fafec98d45162dfdab111978
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -435,29 -435,29 +438,30 @@@ 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 71bf06b02f567232deabe258641b03e833e93c4dee61a120765ad74c13e7faec
+ F src/parse.y e384cb73f99e1b074085c974b37f4d830e885359e4b60837e30f7d67c16ba65b
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11
 -F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
 -F src/pragma.c 2ae4088e9c3ca0e63ffc3ada7f2d2d66e91f0b3db50c7f7ddb2f56e9e37fd638
 +F src/pcache1.c 4d201a7ee865e9a0ddc214db4c997e44215fefa15c1b0ec53cee40e9ba7a9716
- F src/pragma.c 8984481dfc902a0e2ff06eca4d442849f43ad0c27c1979d0c887653320d7cad6
++F src/pragma.c d467106516cc4909449e972464d9824d7305472a3c08821434caeb60de9b9ff3
  F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
- F src/prepare.c 59b758ceea714771ff342d70df7a91a26f93285b29ce739aba4cf5250dd790dc
 -F src/prepare.c dd250f904739b1dc449c131ac527c35e3424d94082dd111321bd83f80c6bb0fe
++F src/prepare.c 8940752514630f8c9727e21b3de2030f4646ccec1c905d1442dcd31f8dcd8a0f
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 6aa1fb1212e601f65b983ee1215d69a591986c8f97a3805c425c625a53839539
+ F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c c9f7b7196e196e93979665680d055a789938b8e025556097bf484b184c0dd576
- F src/shell.c a7067f647aef4b81569bbfd025f4fd120a4e7576a647d2aad05028eb50e50e48
- F src/sqlite.h.in 54053fe5839b296efbbc334f2b126681383ce63e6bd831ff4f53d7d63cba950d
+ F src/select.c 95659b7990e390f9bd8dc30b8975c675fcd1d46e569bc4f5a14e22a8d03e3d14
+ F src/shell.c e89ad1135cb47c95896a1aec4bd0113af90a057d80f20003f354fa56fc10a616
+ F src/shell.c.in dae43a6a43988d955014f070341f296561ea4a43ca2685166a32495b0667ef59
 -F src/sqlite.h.in dad804d4e1979a2ddec33cc8da6aa50c04e6ba0dcb4058e7b3609588d010e041
++F src/sqlite.h.in 82ffe3190542d8f9f618ef94e3b86b1761b4517ba6d3df74ab24c17c58633594
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h 0697bcea9c8e147cb570a217a2945ba2227c6df53612e58b5858821ad0d94018
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
 -F src/sqliteInt.h 0ba730cdc8afa723a5642380712f8bb33abd6a69218571c18b94acf3562de22a
+ F src/sqlite3ext.h 967154985ed2ae62f90d9029bb5b5071793d847f1696a2ebe9e8cc0b042ae60b
++F src/sqliteInt.h eb2f69344ea61b75a7b2f3f4920f544985dfd53e81b13a5c51a95307c525103d
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -513,31 -513,31 +517,31 @@@ F src/test_windirent.h 5d67483a55442e31
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
  F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db5
- F src/treeview.c 6cf8d7fe9e63fae57dad1bb57f6615e14eac0c527e43d868e805042cae8ed1f7
+ F src/treeview.c 2ee4a5dada213d5ab08a742af5c876cee6f1aaae65f10a61923f3fb63846afef
  F src/trigger.c d1cae560bfacc8bfb3a072d73658245c1714c0389097da69b4cb23877a082d7e
  F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
- F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
+ F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
  F src/vacuum.c 874c0f2f15ab2908748297d587d22d485ea96d55aaec91d4775dddb2e24d2ecf
 -F src/vdbe.c adc8a378710ec2376101483cc8a5f499539ee9bbebfb2a784f3370704d5d44ad
 +F src/vdbe.c 2a79b738442ddecf31d08d650d23f343f4e7660242f95057ea6d94369a6b1896
- F src/vdbe.h dde459b1e8a02b8445ecfd5959f38cd5ebb6b0ad392d491d8b159ac8193d231a
- F src/vdbeInt.h 8dd7548d86a98b77b6ed910d8014d0e9e0666356b56f3d16ab7063aad4f102f5
- F src/vdbeapi.c 5eed6c263d01ae60ed08359c31b22299ba15360299522cfbf39af3f84fd69156
- F src/vdbeaux.c 6f01fe8a49b801cc7734ccfc61d1b782131ee3bb7ee28e336f3c73474800f8f9
+ F src/vdbe.h 7bf719031782823b915aff2c1f93d1944c1c6b300770a15339b7dbc9610b802e
+ F src/vdbeInt.h 19bd04a4211fe56c712ab35b48be77fd5a0579b851e9dea2cb8deade359b72b9
 -F src/vdbeapi.c 52844a5a71712197be45f1c63d730c48a745c7457c959465cfb2b969af40a266
++F src/vdbeapi.c 624a7839ad81d6d1aebb06775835c331aa5ec241f4c52fe59977793acfd43665
+ F src/vdbeaux.c 518d1cf6728ecb591390541c58b14902e8d61735ef574426b9971624c54d2c4b
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 8d78df62becfd2dce3c317f64b32a94ecaff8346d814bc8b0b877b38a1ad3718
+ F src/vdbemem.c fe8fce1cdc258320b465934039fe4b1230d63f81d6b81b1eac775b6eec00af0d
  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 a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
  F src/where.c e7cc80943459ade4ccaeb5c7c10f8a0db8b797e0b0f2509de7efc557b76bf7b6
- F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
- F src/wherecode.c f17f5d51e372168db51af637e265aa5e80f99fcc81bfead96b66e71a7732bc62
- F src/whereexpr.c fa51927cc6830b9d3155cafa4e589452ec023fe313a56550d2079dca6c52fbd8
+ F src/whereInt.h 93bb90b77d39901eda31b44d8e90da1351193ccfe96876f89b58a93a33b84c3d
+ F src/wherecode.c c0c4c31573486cd14bb2cbfc63e41eda591609e5190416261999f211bf97abc1
+ F src/whereexpr.c bf983d2d33e325cd63a36c40b8de289fd3d7b4d9f2db9052fb8f59f7161a34a0
 -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
@@@ -571,10 -571,10 +575,10 @@@ F test/async3.test d73a062002376d7edc1f
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
  F test/atof1.test ff0b0156fd705b67c506e1f2bfe9e26102bea9bd
- F test/attach.test f4ff7d463473e2fe9ea3184867961b15dcce2cc3
 -F test/attach.test f4b8918ba2f3e88e6883b8452340545f10a1388af808343c37fc5c577be8281c
++F test/attach.test 402747cea8096d238f8ee8ad3e2b27c05613eb0eb8f697eae1ed1753926763fc
  F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
  F test/attach3.test c59d92791070c59272e00183b7353eeb94915976
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
  F test/auth.test 3d6cd8f3978ba55b1202574e6ecd79c6e00914ca44b9bfd6c1fe6fb873fcac88
  F test/auth2.test 9eb7fce9f34bf1f50d3f366fb3e606be5a2000a1
@@@ -608,7 -608,7 +612,7 @@@ F test/bigfile.test aa74f4e5db51c8e54a1
  F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
  F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
  F test/bigsort.test 8299fa9298f4f1e02fc7d2712e8b77d6cd60e5a2
- F test/bind.test 30af0fc61bc3836034215cdbdeca46113ca1b4a1
 -F test/bind.test 1e136709b306f7ed3192d349c2930d89df6ab621654ad6f1a72381d3fe76f483
++F test/bind.test d9134cb9300ccef302e94dfd66008dc24f14af48595e30beabb49dccbc0ef3ca
  F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
  F test/bitvec.test 75894a880520164d73b1305c1c3f96882615e142
  F test/blob.test e7ac6c7d3a985cc4678c64f325292529a69ae252
@@@ -752,9 -752,9 +756,9 @@@ F test/exists.test 79a75323c78f02bbe9c2
  F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
  F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
- F test/filefmt.test e4edbdc637ca9576ccf4337a3cce627d9df7a56c
+ F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
  F test/fkey1.test ba64806ff9a04eecab2679caad377ae99a5e94e4
  F test/fkey2.test 155809016fad6b2a1491facf2ac53a551bc57c2c
  F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
@@@ -920,8 -920,8 +924,8 @@@ F test/incrblob4.test 21a52a6843a56cdcc
  F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
  F test/incrblobfault.test 74dd8ac108304cea0b4a0df6df63a1567e558758
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
- F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
+ F test/incrvacuum.test b729aab1d4983037da57e66c20dfd7458561a85626dcf824f60175e35f4ce152
 -F test/incrvacuum2.test 7d26cfda66c7e55898d196de54ac4ec7d86a4e3d
 +F test/incrvacuum2.test 1e873b6caf87ce160d4cb6d8c7a46f0570da1ddc
  F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
  F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
  F test/index.test fe3c7a1aad82af92623747e9c3f3aa94ccd51238
@@@ -1073,7 -1072,7 +1077,7 @@@ F test/oserror.test b32dc34f2363ef18532
  F test/ossfuzz.c f5abed3177f719df3c3109901fcdd26b9fb7f581c8da50fc26f3a81ddfb2c2ae
  F test/ossshell.c 296ab63067841bd1b1e97b46a0b2af48ee7f69d50d1a723008bee12dd7122622
  F test/ovfl.test 199c482696defceacee8c8e0e0ef36da62726b2f
- F test/pager1.test 15d423765637d8cd54b025f90ed6c8dc311e2fc3
 -F test/pager1.test 8149b2a8986fee667ab6a8171ab310be19e77ae215bebad0e90c857b0df1935c
++F test/pager1.test 4064c556b67dd1c720fc88970fefdf34b29e2c5e357c9d4be0859d319b4c7342
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -1083,14 -1082,14 +1087,14 @@@ F test/pagerfault3.test 1003fcda009bf48
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test 8aaa22a0f428a7e6b8446b97bc7691a273eaeff5dc290fb9129bf79fa9813a6e
+ F test/permutations.test 5e2e5439642898e0947ced066ad09b82bd817ddfb83dc71291b4c957efc84b62
 -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
@@@ -1219,8 -1218,8 +1223,8 @@@ 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/stmtvtab1.test 2a3cee496574ee9515e5e7a92fb8d9447903ccc14536a21545debeda267ff3c8
+ F test/stmtvtab1.test acc3c40f484f2c4922e270724383d715abb9d69676da907a9c64f31c54f2ef9f
  F test/subjournal.test 8d4e2572c0ee9a15549f0d8e40863161295107e52f07a3e8012a2e1fdd093c49
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
@@@ -1569,12 -1568,13 +1573,13 @@@ F tool/mkctimec.tcl dd183b73ae1c2824966
  F tool/mkkeywordhash.c 2e852ac0dfdc5af18886dc1ce7e9676d11714ae3df0a282dc7d90b3a0fe2033c
  F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae56fc958510aa3fc3ac65e29cb111716199e3d0e66eefaa4
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
- F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
+ F tool/mkopcodeh.tcl bb04ab6e5e2000c91e0c69a597e7e36e002320d123e2e1944cb2819181b72ee9
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 2144bc8550a6471a029db262a132d2df4b9e0db61b90398bf64f5b7b3f8d92cd
+ F tool/mkshellc.tcl 69c38ecd7b74b2b0799a35ce20e1e3998e504d8c99c100ca4b98ae9d8f6279bc
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -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
@@@ -1633,7 -1633,8 +1638,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 6b618b18f7bac4c62d9907240f938cd8655d2b37056a6aaaf4012d62ded041d5 0c246017b45c5290f3a7932dfce649f1a6d8f9afc00c6c3edf2ef06c17dbca1d
- R 3c000ac934a3c3c875fecf313c669cf8
 -P 9e8e1c4aa14bcda165b392d1d8af2ce394a56a8e7b67e4c73c742d8da75e73e2 8a606e4abab4efa03f2e5ffc33d7c5faa3c663f339da87b4ce9f3feed5dc7194
 -R 43a91375009f6b9e40c3c37af47a9695
 -T +closed 8a606e4abab4efa03f2e5ffc33d7c5faa3c663f339da87b4ce9f3feed5dc7194
++P 7f48f6ab2af071ec20204105ed703c60e9fa92602558b910d14b09cc634bed7d e0aca7d2c60d9859750a6e98d3e3b87f79779a45920348fc1bda7f1cb93ef996
++R 591ad72be99c137b3d32778a5f6ff957
  U drh
- Z a2103a0b3c27e8b97a90d3fb694730ab
 -Z cbc0f4e8a6f497f64de5184412579e6e
++Z d8ad20afdc8a1fba27924ffae17a34fd

diff --cc manifest.uuid
index 13a153901cf766a26cb05021db140c6bc2995d3d,06c894dfd932a75004cfc15796b4debbf9e5e893..d68ae944d3da74e8403931c178432803f14c98af
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7f48f6ab2af071ec20204105ed703c60e9fa92602558b910d14b09cc634bed7d
 -e0aca7d2c60d9859750a6e98d3e3b87f79779a45920348fc1bda7f1cb93ef996
++e181225dc7873f6ddfc49393d76becba7040823365326558447dbc6d177ccc2e

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/prepare.c
index 8a0457afb3cd02a3020bf0117686356eac7eea57,17fbf66d38f7243c4b29086c3c0543f029fb498b..48a8ba434bcca3fdf72d165713b2aff0dc121c39
--- 1/src/prepare.c
--- 2/src/prepare.c
+++ b/src/prepare.c
@@@ -788,10 -794,7 +800,10 @@@ int sqlite3_prepare_v3
    rc = sqlite3LockAndPrepare(db,zSql,nBytes,
                   SQLITE_PREPARE_SAVESQL|(prepFlags&SQLITE_PREPARE_MASK),
                   0,ppStmt,pzTail);
-   assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );  /* VERIFY: F13021 */
 +#ifdef SQLITE_ENABLE_SQLRR
 +  SRRecPrepare(db, zSql, nBytes, 1, *ppStmt);
 +#endif
+   assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 );
    return rc;
  }
  

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/attach.test
Simple merge

diff --cc test/bind.test
Simple merge

diff --cc test/pager1.test
Simple merge