Merge all the latest performance enhancements from trunk.

FossilOrigin-Name: a24f805b5eb22452a22b937d372abba4426ae771

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index c3a0f49a28ae9a4574d514a5852ed231fd8be4e3,a14a5ca3c0e04a3e1648e8a2c21e8d04ba362a50..a63ddd7028424aa89a90be21bbc453fe050aaafd
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\strunk\schanges,\sand\sespecially\sthe\snew\nsqlite3_snapshot_recover()\sinterface.
- D 2016-11-26T20:44:52.669
- F Makefile.in e9d578202731ea84020acb548d2b7a0fb681dbf0
 -C Faster\soperation\sfor\slarge\sin-memory\sdatabases.
 -D 2016-12-12T16:08:44.373
 -F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
++C Merge\sall\sthe\slatest\sperformance\senhancements\sfrom\strunk.
++D 2016-12-12T16:15:40.566
++F Makefile.in 49754a1b297c1d454e1008ae6cc26f0ce4be8d02
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc f51b70cb866a4256df2ac27d1da074e3737bf46c
 -F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
++F Makefile.msc 16477ab34568b4cfd8abac4b5840f3dfc7806aec
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -314,7 -312,7 +315,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 7d77bc01d7916b4760baecaa2ade1bade6519c6f
 -F main.mk da18a283b8fc3c6892e9205e6228f3ae60d8cd8d
++F main.mk 846e0b6e723517f9b62b7b571f84b99879da50e0
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -331,11 -329,11 +332,11 @@@ F src/analyze.c 8b62b2cf4da85451534ac0a
  F src/attach.c f6725410c184a80d8141b294fdf98a854c8a52b5
  F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
- F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
+ F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c f1818376b0e160c7af6eff363ea1799323f3b902
 -F src/btree.c 383ce69bd36b0f409bfb8bd028786b2f0a4cbb24
++F src/btree.c 50bd8434b69c419767e5d25de78d549509c5c86b
  F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
- F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
+ F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
  F src/build.c 178f16698cbcb43402c343a9413fe22c99ffee21
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
@@@ -352,10 -350,10 +353,10 @@@ 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 2f8d2c1fa472409625cecacddd39a3b1c6811a26
+ F src/insert.c 91ba5d0143e66479081536ebbaff1850ec9f57d9
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
- F src/main.c 0346ec90973d2b7d628e9fad13ff1f1c7c037859
 -F src/main.c c0daeb1f716de3e93c573aeed6b164faeddee772
++F src/main.c 350f909c5435f2898f1b5fcd416695ab347889c4
  F src/malloc.c 5ee7c2d3dcb1b0a902c9c6d0115deef54736bdfa
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -374,34 -372,33 +375,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 ab6fb76945f600f7e557ca6d7c59dc23e327be70
 -F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 -F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
++F src/os_unix.c 4a58dfdfda7e72aab0e393953890a9b6d40a7ff4
 +F src/os_win.c 4224bff1904dfdf3664680897e1b5077de1fd649
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 68343d9c9cab1981bf0b184cfe19e5e935b5bd65
 -F src/pager.c eaf8590131ab651420e86e89c3fd12d729f55ad3
 -F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
++F src/pager.c 15b855da41f52f16c3832e7670ada0416fb07eb6
 +F src/pager.h 366f586bbcb92b797b954d95bf322083e8e5cf5c
- F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664
- F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
+ F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
+ F src/pcache.c 219fc5238d5c80e2990ab01e1459db3a96866447
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
 +F src/pragma.c 7a32fcc81f3c765621dba31a248dfbeb0342b569
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
- F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
+ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 668c6865b16813dab5f9c18d3672fed11a5c34c5
- F src/shell.c a3fc2c719ed6d381895cbdb66a4a9b6a791cb02e
- F src/sqlite.h.in 55c8eb735888a73cf39bdda1168df7571354e07d
+ F src/select.c b4bd43e1233c87e8a7cf66150421997b0396417e
+ F src/shell.c 9597efa50a4a27bc6440ad99cbcd7fff6957f514
 -F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
++F src/sqlite.h.in b716539d1ab93f3027b320f2393f81cc3e0f0bf9
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 2f3bf6ade77aff107b2c0f6201e04cf11c897b77
 -F src/sqliteInt.h 9d0834b980e2d156109d73c307b803d29d2686e8
++F src/sqliteInt.h 26afd41d8d57267e8e66e30f1c109bffd519ef0c
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c aef87dcd8cb66564d560ab48d43d19ac812a1eab
- F src/test1.c bd204dc2caf8f0b2813884890950c5d3d7529119
+ F src/tclsqlite.c 205c66b9b81d97978a155caa3ef5be9c4de2b174
 -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
@@@ -416,7 -413,7 +417,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c 6a4c7920d1d9c6cc0f7aa50c89c4f80016aeda83
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c c56fe0fc7bc903232931c932381dc69b020445d8
 -F src/test_config.c 83179ea845479b5be9a651d014649e3f2722a1fe
++F src/test_config.c 58800d20433a5af029aad7e937fabf5a4b8ab5ef
  F src/test_delete.c 8499d4d323f2ec8e28301deb3d6ddd8eef8b8139
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
@@@ -451,21 -448,21 +452,21 @@@ F src/test_windirent.c 600398db0198ca1c
  F src/test_windirent.h 7edc57e2faa727026dbd5d010dd0e2e665d5aa01
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5
+ F src/tokenize.c 6eb0752c4fd191f789190c3708ee5b0060fd2829
  F src/treeview.c 4e44ade3bfe59d82005039f72e09333ce2b4162c
  F src/trigger.c 3419bb9862983d84d70735fb4c94b21b934cd0c5
- F src/update.c 1b8321100cac004f0721ab67b16909dd006e663c
+ F src/update.c 1da7c462110bffed442a42884cb0d528c1db46d8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
+ F src/util.c e68e8ced7328f22d2cf7b4c898c394a0de34cdf1
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
- F src/vdbe.c 87cfd557b6b83a86bfbba880876dbf8cfc8dfd3e
- F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
- F src/vdbeInt.h 9b498d3cb52dc2efb53571fb8ae8e14cf298ce84
 -F src/vdbe.c 2d90c42f2117b36e92c3af6a9c9f380b22e6e3b8
++F src/vdbe.c 3e4ca5a30ce222735803f8e2d10904770252b7f2
+ F src/vdbe.h 0c74f6305fb43b9b282dacaff102272370e327d4
+ F src/vdbeInt.h 42e498dbe96475dbb3fda3d85d8fd2a87eff60a2
 -F src/vdbeapi.c ea4e2dc2213cc6bd7bee375a29a9b51c31b93ae0
 +F src/vdbeapi.c ae2cab17a15f495b461275dd3e280881eca96221
- F src/vdbeaux.c 50a8caa4c8ce8b4c26bad807a6cae89fcc3bdb7e
+ F src/vdbeaux.c f5edc89007f8a49e224089a4a4dddbc11bd38213
  F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
- F src/vdbemem.c 1af2f14ab0f7004b364933ddcfc767fb880d4742
- F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
+ F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd
+ F src/vdbesort.c bb34eed4fb52e11ac037dccea4ee3190594c7f9e
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
@@@ -474,9 -471,9 +475,9 @@@ F src/wal.h 1598818fe90532a622ecdec5baa
  F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
  F src/where.c 6bbf9284f4f15a6fa48663d033870cc0d7f5ee66
  F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
- F src/wherecode.c 4ea298998499db5a407ffd70e87e119a86ed7834
- F src/whereexpr.c c19a84ac530835d37217db2181e4fe75901b7b97
+ F src/wherecode.c e04ac8f24c3ac8621df6c3be3ac8c7d4fa893745
+ F src/whereexpr.c 87ecdf24beba4498e4380b31c4131febb0a6ceaa
 -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
@@@ -627,12 -624,12 +628,12 @@@ 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 fa41f0d997e67db921d08c31e73111b32811201a
- F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
+ F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
  F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 -F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 +F test/dbstatus2.test 16194c6aa2d8a050f227890d2ed1eb5f8dcb8300
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -1033,10 -1029,10 +1034,10 @@@ F test/resolver01.test f4022acafda7f4d4
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
  F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
  F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
- F test/rowvalue.test f4dc97fe52d4e206e25b3395588b9497a8eed3ff
+ F test/rowvalue.test 3f468a9e370a3ee8b267e58049679eb0df2b9d01
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 3068f508753af69884b12125995f023da0dbb256
  F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
@@@ -1540,7 -1536,8 +1541,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 d6a7bf80cfb0cdca2bd684adfaba2c3e8053f8a4 b70c85ce6d07b08e13f4ea99edb8f4855a6d7580
- R 2161f892ef1d3b0fc6c2c6b554391adf
 -P d4dff10a3d4edf8e1cc77c0a4f185d33f2c2e953 4fe94b0f1841180dfd8cac33838e335dc6a428bf
 -R ea4e252aab274ae80300d82ccbdd9ba6
 -T +closed 4fe94b0f1841180dfd8cac33838e335dc6a428bf
++P 41a3af5443d8c97ba75cac7f082f06b508f77c24 9675518b33e8d40769daefb860dc748113f750b6
++R 9b64f3ebcb8cab4137466b3cb5f8df97
  U drh
- Z 5c9dbf6e2c8a2984cc671e3fd70ca4a9
 -Z 222df42015043d416e25238322e825fe
++Z 82e4d410ef156868eee9017accb6764a

diff --cc manifest.uuid
index e84b2e3f30d14efea18724f220bf41d570db9d9a,ce37cd3aa69929b5ec16cd5037ab4c1392ea0aaf..1c2f8a316bf8931d91eefd347b4d6a816963e47d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 41a3af5443d8c97ba75cac7f082f06b508f77c24
 -9675518b33e8d40769daefb860dc748113f750b6
++a24f805b5eb22452a22b937d372abba4426ae771

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/pager.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
Simple merge