Merge recent enhancements from trunk.

FossilOrigin-Name: 84f09f00f8731b1b3e057bc629ec14103a44b81d

diff --cc Makefile.in
Simple merge

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

diff --cc main.mk
Simple merge

diff --cc manifest
index 75664350ab3ad818a81377e27333bf321804d067,c6b7f7d8a420ef15daad1a6f38d28830dba91d59..1a6e8adc0148e272dfd8a4d224f5dec97683ec01
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sfrom\strunk,\sand\sespecially\sthe\schanges\sthat\nreduce\sthe\sheap-memory\sfootprint\sof\sschemas,\sand\sdefer\sopening\sand\swriting\nto\sstatement\sjournals.
- D 2016-03-04T14:57:51.652
- F Makefile.in 6fbc35c235396c5e7884e5821b2c4819a2828553
 -C Update\sfts3/4\sso\sthat\sthe\s'merge=X,0'\scommand\smerges\sX\spages\sfrom\sall\ssegments\sof\sthe\sfirst\slevel\sin\sthe\sfts\sindex\sthat\scontains\s2\sor\smore\ssegments.
 -D 2016-03-07T20:14:27.338
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\srecent\senhancements\sfrom\strunk.
++D 2016-03-07T20:48:49.110
++F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc d68db8ddac21ea2576ea5b446f12cf9ebe897a03
+ F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -245,7 -245,7 +245,7 @@@ F ext/rbu/sqlite3rbu.c 371e8bf06cfb3f69
  F ext/rbu/sqlite3rbu.h 0bdeb3be211aaba7d85445fa36f4701a25a3dbde
  F ext/rbu/test_rbu.c 4a4cdcef4ef9379fc2a21f008805c80b27bcf573
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 65a024af764c4ee608f039ee67e5bf009327b7bd
 -F ext/rtree/rtree.c 0b870ccb7b58b734a2a8e1e2755a7c0ded070920
++F ext/rtree/rtree.c 428878f7b016639149f6c95cef5741f835554765
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 96a80c08440c932cd72aac50660e7af2612d2cda
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -276,7 -273,7 +276,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk a1829e4e17a883c03032ee8d320e0bd0d0801cba
 -F main.mk 91cfc30d0fa295be28a86657ad3b1053f0428c9e
++F main.mk 156d1e543ee2c9008aab4a32c094e47f9820b265
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -314,10 -311,9 +314,9 @@@ F src/hash.c 4263fbc955f26c2e8cdc0cf214
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
- F src/journal.c 673cbdde5676eb0c55848f561575d45b609c820d
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 9e2a41adcaff16ebc1ebff1f336cbf33de55396f
- F src/main.c 6f481d601a8a1ad476ca15f1eae64abad2b5509e
 -F src/main.c 93c571d78bc41b257f36912e678db4817d3c540e
++F src/main.c 417bc5748033c15b75fbf6d1d95cc02fd62fee59
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -336,11 -332,11 +335,11 @@@ F src/os.c 4bcb5173e2b51e254397fbed13ed
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c f5bac8e74aaefc4ea520e43b4540793c3b8a9e8f
 -F src/os_win.c f0d7aa603eb6262143d7169a222aea07c4fca91d
 +F src/os_unix.c 4547ba822e88bbbb4749730fb0825e8428485610
 +F src/os_win.c 390534cac9a3730d589241d4c452901bd2aaf7bd
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c b22ed0d3f981be5c7d0a802cd9d85d02878f799e
 -F src/pager.c d40cf1e890a0582b6ac7cb208c24619d72d2c900
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
++F src/pager.c 47637146719cb936a8121e9e4c5f1adbde1765dc
 +F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
@@@ -354,11 -350,10 +353,11 @@@ F src/resolve.c b8f7174e5f8c33c44ded3a2
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
- F src/sqlite.h.in cc65ace88ea9f6eefceeeb680407b7544fea8535
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
++F src/sqlite.h.in 427f02cf8a6e461c50f98a8663fd8f582e659456
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 22d2238dfba194380f43eb7c4ff2143665fd524b
 -F src/sqliteInt.h 8c32c1f4566c577cfb8e1c96e56f61e8b3e780d7
++F src/sqliteInt.h e7468e1b1b69234a26a16918a0e02ac9d3e62a3c
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -375,10 -370,10 +374,10 @@@ F src/test9.c bea1e8cf52aa93695487baded
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
- F src/test_bestindex.c cd36324f05404df5f1a82608a321b91932a549ea
+ F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
 -F src/test_config.c 0dee90328e3dedf8ba002ee94b6a7e7ea7726fe4
 +F src/test_config.c f569bb9c62cb98ffc7968d7f557703197fb4027e
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
@@@ -417,12 -412,12 +416,12 @@@ F src/treeview.c e4b41a37530a191579d3c5
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c a7eeeaffad59c6506f01303a071dac11de8269ca
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c a64585a74aef6feb16dfe4e090b5de01e26eba3b
+ F src/util.c 12800a93f0664f41575f96799eb881a786d565e6
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c 87ae3a5657fefed7875f3eb30e7ababd48013d71
 +F src/vdbe.c 5c09ebeb5d59ca587e0c1d23cdbcddd99864bfe5
  F src/vdbe.h c743791f723049db94f009e3e30958952bc2d512
  F src/vdbeInt.h 49a74fe5ece206d2d8666ba9afaf1abeda5f123b
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 +F src/vdbeapi.c 334db1c072f54fa5bb85bf552046d4397c5534f6
  F src/vdbeaux.c 2c15cf88de4df97428318c8cfac0dea873dae451
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  F src/vdbemem.c 9b0cb32cc267ef026515f15a3594d5ff91fe4dfc
@@@ -430,14 -425,14 +429,14 @@@ F src/vdbesort.c 307460bfa4de4d1c3901fc
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 0eaa33b32c3aa8e8d956cdd4693c4d8604966633
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 56948ada5aacc3bf2628db3776986e8bf4085383
+ F src/where.c ccc62c39af1e6340f6af36fcf68efb96482d4c3a
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
- F src/wherecode.c 3ca820435c5b597bb50e63ed11e938786fe5c23e
+ F src/wherecode.c 870f3e92602f216701a14d3f26805caffbfb5c34
  F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
 -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
@@@ -1401,7 -1397,7 +1402,7 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
- F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7
 -F tool/mksqlite3c.tcl 9382100c82a0a08e63265780536a6c8efead4b65
++F tool/mksqlite3c.tcl 823225909045c7735e9857c408a7ac2bbfb87fbd
  F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
@@@ -1458,7 -1454,7 +1459,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 4fb4aee83da5cd1d75627f96ab431132628aeef4 cb9302cca423de41305719a49208daa392ec09da
- R 383aecef6a5d9ea475d5a43cad1f7c4c
 -P c924008692e35f1f5144830af08d6de051dd21dd
 -R f3add94e73abe6caae33e7ec37099121
 -U dan
 -Z db7aad48334dff0e6979b8c94cd633a5
++P 2f0c195ccc3c9550f0664223fc355b1c27063eba cddf69dbc46f10ee7e87538dd850e086386b544c
++R 57a1cdaba59f7ecec9b6d79e07916714
 +U drh
- Z e9e8354f8de9de140d1bd2781e9d7f5e
++Z ade9a16166eadb6e15caff159818d7db

diff --cc manifest.uuid
index 9cd5f7c3c232c956c68fcb0005d7b4cf6b7bbb41,9c4f38bdbae08b3aba74744198447e79d74a15b5..95b08c731156d414517380f50c02feeb616cfdf3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2f0c195ccc3c9550f0664223fc355b1c27063eba
 -cddf69dbc46f10ee7e87538dd850e086386b544c
++84f09f00f8731b1b3e057bc629ec14103a44b81d

diff --cc src/main.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 tool/mksqlite3c.tcl
Simple merge