Merge all the latest enhancements and fixes from trunk.

FossilOrigin-Name: 41c8b8e39bc0483cfbc0b4bfcc8ef8b2737a70a9

diff --cc manifest
index ac61ab75912f6a890bf900bfa88ea53fe6fbe507,8a550a6fb57328a56aa1c8e2e3267ce216e32a18..f1134c5e0b4c83acb0ba4de89fe43a906fcaad24
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\ssqlite3_db_cacheflush()\senhancements\sand\sother\schanges\sfrom\strunk.
- D 2015-10-30T17:17:12.895
- F Makefile.in 4469ed8b02a9934fea9503d791165367d19db2f7
 -C In\sthe\sOP_Column\sopcode,\sonly\stest\sthe\sbtree\spayload\ssize\sfor\sexceeding\sthe\nstring\slength\slimit\sif\sthe\spayload\sdoes\snot\sfit\son\sa\ssingle\spage.
 -D 2015-11-20T13:33:56.212
++C Merge\sall\sthe\slatest\senhancements\sand\sfixes\sfrom\strunk.
++D 2015-11-20T13:49:01.510
+ F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
+ F Makefile.msc e928e68168df69b353300ac87c10105206653a03
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -279,13 -279,13 +279,13 @@@ F src/alter.c 9d649e46c780166e416fb11db
  F src/analyze.c 4c308880cf53c558070cb8513bdff4ffb1a38a77
  F src/attach.c e944d0052b577703b9b83aac1638452ff42a8395
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
+ F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 0a1dd8e05e69a47b73e09b2e70d2d5f0617205c3
- F src/btree.h 86b2232cafcbae3aa867b2c87f165e942927f48d
- F src/btreeInt.h df0e92901c6fbb01aa8fab3cfbcdaaba2654fd04
- F src/build.c 569313d3777bfcb2dfc89f243d76efd158959325
 -F src/btree.c d3bdd8462a86492e2ebc9aca4a0168429017de25
 -F src/btree.h 2d76dee44704c47eed323356a758662724b674a0
 -F src/btreeInt.h 3ab435ed27adea54d040584b0bcc488ee7db1e38
 -F src/build.c 5a3b71786e2b96d2bb92d40f190eb1fe736f25ca
++F src/btree.c ab52539c0c321de2bf4bb1238cff11eaad55c0bb
++F src/btree.h beef31274289a103fa811a7d7adc2dcedbcf2077
++F src/btreeInt.h 99ebf5c9716a8dd1ea6c0583b624e8e0de148d61
++F src/build.c a59767596bf5dfa2c9cceb756bff50a17741c2d2
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
@@@ -324,28 -323,28 +323,28 @@@ F src/os.c 8fd25588eeba74068d41102d2681
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c fc93d55f96bb978f0b0168c6ea7d6fc60b0e172c
- F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
+ F src/os_unix.c eb24e0340fbe3cfd0eabfb15a71476953e54fa73
+ F src/os_win.c 2d77dab5c555a18c0aff379c6a692fc3499044d9
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c e69349b91ad7414f32484352057898e820020085
- F src/pager.h 6f280ca64b57cb2faace7e9045ce2b09493eaa06
- F src/parse.y 764d5b40e8ac0ce356b6ba096df5cc246b3829e1
- F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
- F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
 -F src/pager.c 18341e2b759b447cbc82fb9215d08d9c5864e92e
 -F src/pager.h 87c4118a71ba3965184148b379a6d93179071091
 -F src/parse.y 23737e649c26ce327603799e57f5c2ff50e5e6ba
++F src/pager.c 44cc9e8e5df703e52b8e305ff9af2fddf6c62d0f
++F src/pager.h f392409a9c64a700c4756b6111b8e73a78d07cf3
++F src/parse.y b0ad024157be717d43f9e1eb4f377873574153a3
+ F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
+ F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
  F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
- F src/pragma.c 8fd4c8a12e25f0d916426f160255ebe25415eba7
- F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
+ F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
+ F src/pragma.h 3d94aebbebd2089899fecc01909bf2608b39507d
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
- F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
+ F src/printf.c f8fc8f04e75b1e983ef2793c27ec7a43b287e94a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
- F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
- F src/sqlite.h.in 3cfc86c55e57c63d86b9e1e92869e2bfb162ca8e
+ F src/select.c 2376d320907a5c28c55290f18fd94aa3400bf97c
+ F src/shell.c f0f59ea60ad297f671b7ae0fb957a736ad17c92c
+ F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h 00b72ce91549aa675876f1757f54f432fd999e6e
 -F src/sqliteInt.h 64256d193a16a147d9f6317cc4e095fdd3e0a2e9
++F src/sqliteInt.h f298ca1b9fc4826becdec3918f10d216a23ac4d1
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -364,7 -363,7 +363,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9
  F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803
  F src/test_blob.c e5a7a81d61a780da79101aeb1e60d300af169e07
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c cbdf8757e36d0d29f48c636f02ea45fa905792b2
 -F src/test_config.c f2824de39f59d8d621e2d6ec5cc67006d000b2eb
++F src/test_config.c a482301b987f859098d5985cc19c239d8cd6e340
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -402,12 -401,12 +401,12 @@@ F src/trigger.c 322f23aad694e8f31d384dc
  F src/update.c 40e51cd0883cb5bfd6abb7d8a7cd8aa47fab2945
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 7a4efb964a050fd3cd733b051ce2ef1c8d609f53
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
- F src/vdbe.c 4ab876409aaf77781a88ce8ae6da433eb0d86b3b
++F src/vdbe.c 6b125884a09e7fc33b062baa0b44f38fe6f40af8
  F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
  F src/vdbeInt.h 33403622c6a8feaaac5f0f3f17f5d1bf6df42286
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
- F src/vdbeaux.c 2a20e7f59c04824d16c002d51cf3ff62efe96474
 -F src/vdbeaux.c da9eddc62e025148e30267600a6fe3882d5e912f
++F src/vdbeaux.c 0a6263b83b63843360b676542d5eb5e2846c178f
  F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
  F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
  F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
@@@ -1277,8 -1278,8 +1281,8 @@@ F test/vtab_alter.test 9e374885248f69e2
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
  F test/wal.test dbfc482e10c7263298833bb1fc60b3ac9d6340a1
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 +F test/wal2.test dc801f6d3f8f39d1534ffbd15a715b0b287508db
- F test/wal3.test 2ab8e490afe0164bfc89b185c8b2572e0d821f23
+ F test/wal3.test b1d425f68a1f61d12563f0fa1ee6fca7d5afabf4
  F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
  F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
  F test/wal6.test 4421cd5a2fa99d29cc91ef12fb23bed171ed3a4c
@@@ -1343,9 -1345,10 +1348,10 @@@ F test/zeroblob.test 3857870fe681b81856
  F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
  F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
  F tool/GetTclKit.bat 8606413d3035c05373a0d7fae82ebf59ae9e16c3
- F tool/addopcodes.tcl c732baeac0528e5d7d9306c3a74c914997fe93eb
 -F tool/addopcodes.tcl 4ca9c3ef196f08da30add5d07ce0c9458dc8c633
++F tool/addopcodes.tcl 783164304cdbf2b473e119b2c4db0c01b92a2b84
  F tool/build-all-msvc.bat e42141ca3c3812315432f9813ef9eb78aa8d99c9 x
  F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
+ F tool/cg_anno.tcl 692ce4b8693d59e3a3de77ca97f4139ecfa641b0 x
  F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
  F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
  F tool/fast_vacuum.c 5ba0d6f5963a0a63bdc42840f678bad75b2ebce1
@@@ -1359,7 -1362,7 +1365,7 @@@ F tool/lempar.c 3ec1463a034b37d87d782be
  F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
  F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
  F tool/mkautoconfamal.sh 4bdf61548a143e5977bd86ab93d68b694d10c8fa
- F tool/mkkeywordhash.c ff6fc41e733204e289b38b9cd3808701725c6793
 -F tool/mkkeywordhash.c 06ec0b78bd4fa68c12d90ef2bdfe76b039133ff8
++F tool/mkkeywordhash.c 24c1fb16c51f4f72c9027230ff575c47b6d3b828
  F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
  F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@@ -1400,7 -1404,7 +1407,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P bf866e6c0d95d48744c86ff0c0be9b2653629a18 7565b046ff939e8310631397a4526fbd98b99aaf
- R bb025d4354b8efe42b8f9f24be63437f
 -P 5446ae64d7f92444ca40aae2108015d1d77bc03f
 -R a5098759debd354cc66c1a03fdae8b41
++P f2cde4cfc58cc372f59ae274bf0c2f7cf6e7ddf9 35c7f6cba6febf2480de01fca9d61b8065bf1c12
++R c1404ace283281f01646ea3d425143a2
  U drh
- Z 8831d8115b67000b0013e73a4bc13ce5
 -Z f951ff158d10f4e00f2e4ba144c0ce20
++Z 1cdd9c780b66b45977a11df8c67e2bf8

diff --cc manifest.uuid
index b524521fc2d00f31d4c3c4736014a2363613335a,704f765b402d1941a33de3fec0c7a21a6a5637e6..05825a74e95449e7d1da7eb584108b5c04ce7f5c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f2cde4cfc58cc372f59ae274bf0c2f7cf6e7ddf9
 -35c7f6cba6febf2480de01fca9d61b8065bf1c12
++41c8b8e39bc0483cfbc0b4bfcc8ef8b2737a70a9

diff --cc src/btree.c
Simple merge

diff --cc src/btree.h
Simple merge

diff --cc src/btreeInt.h
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/parse.y
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc tool/addopcodes.tcl
index 7341a810ec3dd24d61b48b3871612c24ad9b9637,84e3994ce8c8f9df536b9bd67b13c15f2dff5bdf..aad1c4a0c27d35f8ff3cee48549b4f248bb43da8
--- 1/tool/addopcodes.tcl
--- 2/tool/addopcodes.tcl
+++ b/tool/addopcodes.tcl
@@@ -38,8 -37,13 +37,15 @@@ set extras 
    UMINUS
    UPLUS
    REGISTER
 +  EXCLUSIVE
 +  CONCURRENT
+   ASTERISK
+   SPACE
+   ILLEGAL
+ }
+ if {[lrange $extras end-1 end]!="SPACE ILLEGAL"} {
+   error "SPACE and ILLEGAL must be the last two token codes and they\
+          must be in that order"
  }
  foreach x $extras {
    incr max

diff --cc tool/mkkeywordhash.c
Simple merge