Merge the ORDER BY LIMIT fix, and other enhancements, from trunk.

FossilOrigin-Name: bf5a9542d0600062651aedc6d2543ce72dd21744

diff --cc manifest
index 4a8ab43dc80a58827a8019aa1d8bffb9769782ed,3ea36916cca9bdf170c7dcfa06d98d82f49ff697..84da04b09587b5cb4f83f74a07b6217df2334034
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\strunk\sfixes.
- D 2016-07-28T18:42:21.282
 -C Make\ssure\sthe\sORDER\sBY\sLIMIT\soptimization\sis\snot\sapplied\sif\sthe\sinner-most\nloop\scan\sonly\shave\sa\ssingle\siteration\sand\sis\shence\snot\sreally\sa\sloop.
 -D 2016-08-04T09:09:44.760
 -F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
++C Merge\sthe\sORDER\sBY\sLIMIT\sfix,\sand\sother\senhancements,\sfrom\strunk.
++D 2016-08-04T09:13:42.493
 +F Makefile.in 7ac1f34182d307765c6439c899bd3dac2af587bf
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
+ F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -255,9 -255,9 +255,9 @@@ F ext/rbu/rbuvacuum.test 4a977447c15c25
  F ext/rbu/rbuvacuum2.test 45009e127c3fb385e5c0fd5a8a63fb922a79d0ab
  F ext/rbu/sqlite3rbu.c 948677ee0ec57da51148e6c5f64ac68afcf36ab2
  F ext/rbu/sqlite3rbu.h db8858120c9be14b60c9225f9da28221f5f6b945
- F ext/rbu/test_rbu.c 9f043b74c46c45b231f4313aed1fccb379a76fe6
+ F ext/rbu/test_rbu.c 1a6bbc6982e32485a48df111d0bb1934d537eabd
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c d26a815b0df1c412a6881dae8d7fd3c9c08cce68
 +F ext/rtree/rtree.c 45c6bec21cfe7579c5b81f2f236bd929b839694c
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -301,10 -301,7 +301,10 @@@ F ext/session/sessionfault.test da273f2
  F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0
  F ext/session/sqlite3session.c 37485891b4add26cf61495df193c419f36556a32
  F ext/session/sqlite3session.h 69bf73cfd71e58f2ae5d2aa935b2c1a541aee555
- F ext/session/test_session.c 464f2c8bf502795d95969387eb8e93f68c513c15
+ F ext/session/test_session.c 2caed9a659586428c63ca46e4900347b374487d4
 +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
@@@ -330,7 -327,7 +330,7 @@@ F src/auth.c 5c8e0f37f785f935f589496801
  F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c eb4d02a0795a36a8314cf79a735ae19cec19442e
 -F src/btree.c 2551bd3ecb8b8988fb8b23aabadfb214dbc38e46
++F src/btree.c 0a3308f223e400a4865ba611073888683fce4af6
  F src/btree.h 075c45707c0f8f8af118f739f36df8098a08b7da
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
  F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
@@@ -349,9 -346,9 +349,9 @@@ F src/hash.c 55b5fb474100cee0b901edaf20
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
- F src/loadext.c 5dd8b5a67d32a98bb75657c2a9e48b2cedbf13a4
+ F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
 -F src/main.c 16c1b2114eae8804caf3a8de8cb47bf2c6d83ad3
 +F src/main.c 8473928b7bcd24d492ff16c701dd0d4bbd3db190
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -387,60 -384,59 +387,60 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
- F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
- F src/sqlite.h.in 944ce442e0800b2ee6334d53a49be6aabfb7f74f
+ F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
 -F src/sqlite.h.in e011dcc3942e6ddc8dd7b894e9e6702e4269161e
++F src/sqlite.h.in 21a208cd353619cf1f3d6ec486d1476abd047ee3
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
- F src/sqliteInt.h 5fa89170e0ad08605cfb87b771ad70bf5a089317
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
 -F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
+ F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
++F src/sqliteInt.h 843e15ad1367967c74de7eeef088a6659613d395
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
- F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
+ F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 5c213bf5fee084390f632df2328cf0821d483799
- F src/test1.c 5445032d4f1de27138802b26d8908fc3af028ba3
- F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
- F src/test3.c c75c8af0eadb335236c9e61b51044c58a8f7dd59
- F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
- F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
- F src/test6.c a684b7abd01352ab50cb79c0bf727e6b3f381a3d
- F src/test7.c 9c89a4f1ed6bb13af0ed805b8d782bd83fcd57e3
- F src/test8.c fa262391d3edea6490a71bfaa8fed477ccbbac75
- F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
- F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
- F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
- F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_bestindex.c f9e6807c52aa532e4775321ce3ed8e47c907ed45
- F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
- F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c 7711c82d42b9347540b6c8f628560055ff99b42a
- F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
+ F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454
 -F src/test1.c 0a0909cf7962d2359db329c08d15b90b4b6e724f
++F src/test1.c 82d5cdb9bc825b8882d32ad08896dfd7e85a2766
+ F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
+ F src/test3.c 1339a40be39650ae83894b6578f971dc7f96ea8a
+ F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
+ F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
+ F src/test6.c 55aa2775c154415dcf4ed7cd1e19a193122b3a02
+ F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010
+ F src/test8.c 4f4904721167b32f7a4fa8c7b32a07a673d6cc86
+ F src/test9.c 12e5ba554d2d1cbe0158f6ab3f7ffcd7a86ee4e5
+ F src/test_async.c 195ab49da082053fdb0f949c114b806a49ca770a
+ F src/test_autoext.c 915d245e736652a219a907909bb6710f0d587871
+ F src/test_backup.c bf5da90c9926df0a4b941f2d92825a01bbe090a0
+ F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
+ F src/test_blob.c a0f7ad49a0c9d4b72f693fe2a71c58d7e507174d
+ F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c 4d3d4a886416f369771d69a6dba926866deda788
++F src/test_config.c e91bd1471a56cf0267fd934f13e916b788e5f7af
+ F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
- F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
- F src/test_func.c 37453d346cfcf118774efd5bf6187f7e6a7e3254
- F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
- F src/test_init.c 66b33120ffe9cd853b5a905ec850d51151337b32
- F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5
+ F src/test_fs.c ac62ce7d5c0c23aa6932891cad5746945564c91c
+ F src/test_func.c a2b4993da973b0ea60dd5d51a7066238ede8c329
+ F src/test_hexio.c 1d4469ca61ab202a1fcec6543f584d2407205e8d
+ F src/test_init.c 4413c211a94b62157ca4c145b3f27c497f03c664
+ F src/test_intarray.c 988fc61cb0ff539f4172c0d95f15287c92516f64
  F src/test_intarray.h f3b7672f5d1056eac563c0d6ea8480a660b1475c
  F src/test_journal.c d3b83f2bcb7792c709e57abddc456a2b1818643a
  F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
- F src/test_malloc.c 6b27e947eeeb70d11aa65406ed28d749e39b6356
- F src/test_multiplex.c eafc567ebe162e36f17b5062285dfe90461cf8e9
+ F src/test_malloc.c c05f6c40bd6c8bfe5f1718212f81fd5687f91766
+ F src/test_multiplex.c 7c5b218d855cd0505a43185d55283b3fc257c8da
  F src/test_multiplex.h 5436d03f2d0501d04f3ed50a75819e190495b635
- F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c
+ F src/test_mutex.c 7f4337ba23ee6b1d2ec81c189653608cb069926a
  F src/test_onefile.c 416f87a28d6d673352d33fc4b1c7d39db878e50f
- F src/test_osinst.c ad0233b1dabb0390e25edded4ebd79a2a61538c6
+ F src/test_osinst.c 98ef31ff03d55497829ca0f6c74a9f4e1aa48690
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
- F src/test_quota.c 180813f43683be5725458fc1ff13ac455d8e722d
+ F src/test_quota.c 6cb9297115b551f433a9ad1741817a9831abed99
  F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d
- F src/test_rtree.c 43fff4c5a01576d6d213f27472598801a247890c
- F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
+ F src/test_rtree.c 671f3fae50ff116ef2e32a3bf1fe21b5615b4b7b
+ F src/test_schema.c f575932cb6274d12147a77e13ea4b49d52408513
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
  F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
- F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
- F src/test_syscall.c 268c072541162564a882c57f54a6fee12ef4a4d2
- F src/test_tclvar.c d86412527da65468ee6fa1b8607c65d0af736bc4
- F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
- F src/test_vfs.c 4d02f38bfb8f7f273da7ba84bfe000f5babf206c
 -F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
++F src/test_superlock.c 793bb9d43a924c21993bcd6c2e200d3db8abf34e
+ F src/test_syscall.c 1073306ba2e9bfc886771871a13d3de281ed3939
+ F src/test_tclvar.c df9fe1213c2634687a9ca0b0bec0d2119d359ae3
+ F src/test_thread.c 911d15fb14e19c0c542bdc8aabf981c2f10a4858
+ F src/test_vfs.c f0186261a24de2671d080bcd8050732f0cb64f6e
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_windirent.c 8f5fada630348558d5745b334702f301da1ffc61
  F src/test_windirent.h b12055cab6227f7be10f5c19296f67c60cc5e2a5
@@@ -462,12 -458,12 +462,12 @@@ F src/vdbeblob.c 83d2d266383157b02e2b80
  F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 948d2d4984219eee37a7bf427d6667e21e6eb92e
+ F src/vtab.c 6fece06fdd50eb2b0673e37e627ce6710e4af5be
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 -F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 +F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9
 +F src/wal.h f38853cd771ff42f448de4f908238f2e2966ac8f
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 8ccc01f9227d41bfaf09360f108583be4a36d3b1
+ F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3
  F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
  F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
  F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
@@@ -1077,9 -1072,9 +1077,9 @@@ F test/shell4.test 69995ee1cc278eb149aa
  F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9
  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 d37a75b4be4eb9dedeb69b4f38b1d0a74b5021d7
+ F test/skipscan1.test f2d4482f195f018c3732374d3985fc34bcc3ae1a
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
  F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
  F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
@@@ -1354,36 -1350,36 +1355,36 @@@ F test/vtabI.test 751b07636700dbdea328e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  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 a9d6aa635b9d63607dabdc11406f5f96ca986635
 +F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
 +F test/wal2.test 72286d113a40817702fa59285ee5b82effbfe754
 +F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
 +F test/wal6.test 557fab4cc02b4ce2adf1d0f8821cb8acdaa1304f
  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 059cb75484a1ecf6357a2c1b3324b8156749221e
+ 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 310f5f364e64eaaa2f2233229a7b602ccb038bc9
 +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
@@@ -1453,9 -1449,9 +1454,9 @@@ F tool/mkopcodeh.tcl a01d2c1d8a6205b03f
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
- F tool/mksqlite3c.tcl bfafc3e96885a2afa8b0d733826ee89e2db3d8b3
- F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
+ F tool/mksqlite3c-noext.tcl aa58ea3be311c81821c2cd3209f55e46b07ab656
 -F tool/mksqlite3c.tcl 655181fb25f69b3524b30efd0750c43513415216
++F tool/mksqlite3c.tcl af4b267e6a8546c31dd0b458b720cb567b9ea474
+ F tool/mksqlite3h.tcl cf5cd68028e69a51ed5c76042672664201f0f756
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1513,7 -1509,7 +1514,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 91e811f51e611a37372875e96a4c51bbed2dfdea 805d01cdabb48a69eb986a7f084e53eb25d76b7f
- R 1f1e8b1dc5bfb43f90c10984a7e1c85e
 -P 722c12816347ee9fce7a090cfebef2c5841e7445
 -R fd11dfb179ebaeb65493cf49055d4419
++P 97657445860363f5bd62c37e6a565e782e7eb908 13e3bd3de6b434b6182ef36be108d7ee0be8ca53
++R dcbff44ad7238e2e7323f3593b7e2fbf
  U drh
- Z 3d02145717de05c1fec9768a8381adbd
 -Z c8d986adc7b509414bb3aed9ed932c87
++Z 16f488bdf582c2eec981dc2b1bf278d6

diff --cc manifest.uuid
index f387980271324f847a05ce8fdb81038faba7bbe4,832eed621e3e2aafc6019048fc0aa55f06c2d515..280a77302650d73361b5192aff4dd976079d3e31
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 97657445860363f5bd62c37e6a565e782e7eb908
 -13e3bd3de6b434b6182ef36be108d7ee0be8ca53
++bf5a9542d0600062651aedc6d2543ce72dd21744

diff --cc src/btree.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/test_superlock.c
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge