Merge all pending 3.18 enhancements from trunk.

FossilOrigin-Name: 1650c3f468e6fc9bfed3dac469b32ae9f501f64e

diff --cc Makefile.msc
Simple merge

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

diff --cc manifest
index d07f805f54b56bd60f9a59e916d2f80690ae5d14,6e1234fc6997e196885b83abf8451a9cf665bfc7..6772d6f1feb8975acf43a60a03430225f8bd64f1
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sall\schanges\sup\sthrough\sthe\s3.17.0\srelease.
- D 2017-02-13T16:17:04.451
 -C Add\san\sinitial\simplementation\sof\sthe\s"PRAGMA\soptimize"\scommand.
 -D 2017-03-06T17:33:58.293
 -F Makefile.in edb6bcdd37748d2b1c3422ff727c748df7ffe918
++C Merge\sall\spending\s3.18\senhancements\sfrom\strunk.
++D 2017-03-06T20:00:04.313
 +F Makefile.in 0c27f4cee5d1d12f3a8d8fa88500c7264d2f4b36
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 21aedd447ab31c455f963a71d9952841ed277814
 -F Makefile.msc a89ea37ab5928026001569f056973b9059492fe2
++F Makefile.msc ec6e29fe200869fd03cc41679a055c0f17ec9ea1
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION cddd8d88dc8202afa0ebc96da61fc4acbd1e96a5
+ F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -264,7 -267,7 +267,7 @@@ F ext/rbu/sqlite3rbu.c 2a89efba9eeba8e6
  F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
  F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c e1bb8d04672c9c5c753ac7fb42f7688363343020
 -F ext/rtree/rtree.c 3f3a595dba485e340246fa2c8ba330a6b9768b00
++F ext/rtree/rtree.c d99720f7cc800ec9917f5053e8fda41f6ff82871
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -312,10 -315,7 +315,10 @@@ F ext/session/sessionwor.test 2f3744236
  F ext/session/sqlite3session.c 13642d9c754cc18f17e141f82860d269e2adf920
  F ext/session/sqlite3session.h d4db650adfcc7a4360e9f12a09c2d117b1db6b53
  F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386
- F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
+ F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 3410be31283abba70255d71fd24734e017a4497f
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
@@@ -340,17 -340,17 +343,17 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c 05843aa2287d3246793cc09a32c3603566037f49
- F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
 -F src/btree.c e2bae0a03f73d119910fb35c9550987564065137
++F src/btree.c 75b117045699d59ff5603792e46482032ce98ba4
+ F src/btree.h bf64dfeeddeebdb775a5eba0098bbc00d073290d
  F src/btreeInt.h cd55d39d9916270837a88c12e701047cba0729b0
- F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
+ F src/build.c 43f903c9082040ced2b421543cb0300c2973647d
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
- F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
+ F src/ctime.c a9984df73898c042a5cfc8f9d8e7723d02bc35c9
+ F src/date.c ee676e7694dfadbdd2fde1a258a71be8360ba5ae
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
  F src/delete.c 0d9d5549d42e79ce4d82ff1db1e6c81e36d2f67c
- F src/expr.c c218ec8cfc12b2c5b354660ce7285dfaf43305e9
+ F src/expr.c 8a29e9b72d4b642189999c41782cd6c5bc43512f
  F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
  F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
  F src/func.c c67273e1ec08abbdcc14c189892a3ff6eeece86b
@@@ -359,11 -359,11 +362,11 @@@ F src/hash.c 63d0ee752a3b92d4695b2b1f52
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 444354c23d4d140a57d6eb46f34e376a7f8f62e8
- F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
+ F src/insert.c 3ed64afc49c0a2221e397b9f65d231ffbef506fe
 -F src/legacy.c e88ed13c2d531decde75d42c2e35623fb9ce3cb0
++F src/legacy.c b143b1fe422524cb29cb5ac907c8a44684333d75
  F src/loadext.c a68d8d1d14cf7488bb29dc5311cb1ce9a4404258
- F src/main.c 54068ad4462bb4b44f8308e0dc3d2bfda1f51af3
- F src/malloc.c f345c60d093d6c6cf451b99a7344a123b1a70fd9
 -F src/main.c 158326243c5ddc8b98a1e983fa488650cf76d760
++F src/main.c 0c3fecdde19dc698bb59d1901a8696a6be36ff64
+ F src/malloc.c d0a1474236486165bcb349af82e2a6560178bf7b
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c fd7cd6fe21d46fe0a4186367dd8dc26d87b787eb
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -375,40 -375,39 +378,40 @@@ F src/mutex.c 8e45800ee78e0cd1f1f3fe8e3
  F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
  F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
- F src/mutex_w32.c 3631e57d056062807ae2c92b79f3d1c05f04ecfe
+ F src/mutex_w32.c a898fa969823b100c0f5fdc57e54c9a1e419ab4d
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 -F src/os.c add02933b1dce7a39a005b00a2f5364b763e9a24
 +F src/os.c c03b50496df5815e8f6d45bae4404b73cadf069b
  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 4a58dfdfda7e72aab0e393953890a9b6d40a7ff4
- F src/os_win.c 4224bff1904dfdf3664680897e1b5077de1fd649
++F src/os_win.c 85b19486054c8cd5c4117dea882d983ea065d16e
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 -F src/pager.c ff1232b3088a39806035ecfac4fffeb22717d80b
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 +F src/pager.c 8a4a3066cf9b06191b852dc0bdcb70a06de9c472
 +F src/pager.h 32adb801774046224e87829fa74ce16ce31a9087
- F src/parse.y 591704fce84f814d9a3642774c1f011d38f4149c
- F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
+ F src/parse.y af8830094f4aecb91cb69721f3601ad10c36abc4
+ F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c 75fdb05838c303cf0ce5846ca011b8103531c42c
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
- F src/pragma.c 26e6c5f11e87de33b6d1852be2b12471e0c32baa
- F src/pragma.h 61aa5389118594bebb28120a6720401aee34ce1a
++F src/pragma.c 5e1dfb5a07753d70c48f596e1a367768e9434d88
+ F src/pragma.h c9c763958fec92b04125571472c9500b351c5f7f
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
- F src/printf.c ff10a9b9902cd2afe5f655f3013c6307d969b1fd
+ F src/printf.c 67427bbee66d891fc6f6f5aada857e9cdb368c1c
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c f9bc0de45a30a450da47b3766de00be89bf9be79
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c d12f3539f80db38b09015561b569e0eb1c4b6c5f
- F src/shell.c a84e453c213f3e0d6935a582024da4e242f85a19
- F src/sqlite.h.in 080c30ae3f98fc4859cfb125fbe8430ae86fe8f1
+ F src/shell.c 27d2b31099fd2cd749e44d025ef9b54ca26692cb
 -F src/sqlite.h.in 4d0c08f8640c586564a7032b259c5f69bf397850
++F src/sqlite.h.in 329de1e75636972ba4b9388971ba47d3e2cb9116
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 8f2b51c4adc37a831bb1ac500ac30def8230780c
 -F src/sqliteInt.h df268ce1d04df042cf43b557d2309eb0b71e86c4
++F src/sqliteInt.h 85eba6f13086a33be08ef7237af7b8be9884d0f3
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
- F src/tclsqlite.c 418f5e5e0840425a7e5b33f3600dccd378a57549
+ F src/tclsqlite.c 6c2151b6d8d98e183a04466d40df8889c0574d79
 -F src/test1.c 8a98191a1da8e100f77cdb5cc716df67d405028d
 +F src/test1.c c5700d147d3156a93485f9cb6ec397b151841c96
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -421,9 -420,9 +424,9 @@@ F src/test_async.c 195ab49da082053fdb0f
  F src/test_autoext.c 915d245e736652a219a907909bb6710f0d587871
  F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
- F src/test_blob.c 6a4c7920d1d9c6cc0f7aa50c89c4f80016aeda83
+ F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c 83179ea845479b5be9a651d014649e3f2722a1fe
 +F src/test_config.c 58800d20433a5af029aad7e937fabf5a4b8ab5ef
  F src/test_delete.c af7eab5702f853fb1c62a5f7665e2234cf1ae17b
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
@@@ -463,27 -462,27 +466,27 @@@ F src/treeview.c 4e44ade3bfe59d82005039
  F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
  F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 3d2ce209a89b95cf35bffa16440f57368576e2ee
- F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c 2830f9c234b2ec833b9cf284a07ea6979d0e1e93
+ F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
+ F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
 -F src/vdbe.c f520378e510fd36bbf289921798dbc8f2b3dc30d
++F src/vdbe.c b6dfec95671b4b22f4f3d9f3d7f081405b8043e0
  F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
  F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
- F src/vdbeapi.c 56ef5bdfd94c73f0b29019e78cbf72ced9c35541
- F src/vdbeaux.c b9a36e530e6525ca9d9a685bc7b1d01fa77b5cf8
 -F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
++F src/vdbeapi.c 995f635640bdbc38d95f24c467b87e79646b4ce4
+ F src/vdbeaux.c 57361f2e761d92a254638bdbfc03fc68ae6aebc6
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c c4bbe0f870f52036553f8098aee0703997f0577a
+ F src/vtab.c 007513c2ef52472fcdea6a741683d50662e82790
  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 91a6df7435827e41cff6bb7df50ea00934ee78b0
- F src/where.c b0d81c6f24ea6aebb249c92c5d78ec8ab1452523
- F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
- F src/wherecode.c 99a8ced164c75edf41b3a865a75381c9adb38b28
- F src/whereexpr.c 35ad025389a632a3987a35617c878be3b3d70dc6
+ F src/where.c 1a3a8adb717a20f17c186f3baa22b0b5f3a5ab13
+ F src/whereInt.h 2d50c2b74a33be44cb68fdecee30b4d93552f1f4
+ F src/wherecode.c 677e95413c472c0b413023b6b69a47f40fce1b04
+ F src/whereexpr.c 130cdd1a43af71b19755270fb1224874cf55158c
 -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
@@@ -635,10 -636,10 +640,10 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
 -F test/ctime.test ff6c38e822459d6ca743c34901caf57740b08b54
 +F test/ctime.test a4effbe5472ef6c0308c4ebcba55c802aa297fff
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
  F test/cursorhint2.test 8457e93d97f665f23f97cdbc8477d16e3480331b
- F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
+ F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373
  F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e
  F test/dbselftest.c b2e6cfac59066dbcb7334b66304bb15a5508dd42
  F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
@@@ -676,10 -677,11 +681,11 @@@ 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/emptytable.test a38110becbdfa6325cd65cb588dca658cd885f62
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
  F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
  F test/enc3.test 6807f7a7740a00361ca8d0ccd66bc60c8dc5f2b6
@@@ -1021,12 -1023,12 +1028,12 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test 46ad98770d3c04ce2418cab2cc527647bfe961a7
 -F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
 +F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
 -F test/pragma4.test 6e85b6eab8e61ffc9c7db59d842276674e8e3264
 +F test/pragma4.test 2fcabe7a352888f8aa70aad87eabe6481ea99b04
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
- F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
+ F test/printf2.test 9e6db85f81c63f2367c34a9d7db384088bd374ad
  F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
  F test/queryonly.test 5f653159e0f552f0552d43259890c1089391dcca
@@@ -1174,7 -1176,7 +1181,7 @@@ F test/temptable.test d2c9b87a54147161b
  F test/temptable2.test cd396beb41117a5302fff61767c35fa4270a0d5e
  F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
  F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
- F test/tester.tcl ea01a5b6111fda62857d092b128e0d890049e6ed
 -F test/tester.tcl 581f0185434daf7026ccede4c07e8d1479186ec5
++F test/tester.tcl f98d157a622f083feb74db32ed832b0629127edf
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1498,10 -1500,10 +1505,10 @@@ F tool/mkmsvcmin.tcl 95b37e202cbed873aa
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl ebb4bfcd2f8010e0a3934b6118db4b5f2f5edf5c
+ F tool/mkpragmatab.tcl 2ffe6d5fdc2d3381621d6c77978ba054466e757f
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
 +F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66
  F tool/mksqlite3h.tcl b9836752c3d08f9fab2dfc0017ca9fd5d90ac863
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1560,7 -1562,8 +1567,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 92dbd8753eb399f8e377ecd1f0805b606ee6fce9 ada05cfa86ad7f5645450ac7a2a21c9aa6e57d2c
- R a0f617481e61949163b41b6ca12f055e
 -P 45797feefe90cb7da53256b0c42fdaa1221d0a27 5f7fc79aa06ca9b79664c50c3c277c98a74ff9a0
 -R d076238fa06701bd917c02e95912d525
 -T +closed 5f7fc79aa06ca9b79664c50c3c277c98a74ff9a0
++P 1913a7581024719ea31b7343b2a42a4b60c1c8eb 137aeb2b160888100bc1e871b00860149e5f6196
++R a6a1495a6ac1ed94de45cb652b36beb7
  U drh
- Z 4c6490b21766c3c3b1fc6f5f48bd4e36
 -Z 60608bb3fd59af1c228de2bc78db17f1
++Z 11654ff61593cf67481e1c8912084572

diff --cc manifest.uuid
index fa2397a3888556ffb0bed44c1a87f3f2c0be4229,c68e3d13a82e9ac608d779f2836b6bf784fe9557..cea2a119b5a42c3fca1d85b100b9de63d22a293c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1913a7581024719ea31b7343b2a42a4b60c1c8eb
 -137aeb2b160888100bc1e871b00860149e5f6196
++1650c3f468e6fc9bfed3dac469b32ae9f501f64e

diff --cc src/btree.c
Simple merge

diff --cc src/legacy.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pragma.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/tester.tcl
Simple merge