Merge in the 3.9.0 changes from trunk.

FossilOrigin-Name: 5c3a2a6ed64f4d0e10238720bc2e4ae3af3eded3

diff --cc manifest
index 3e6b8b92676b69578c2e545ae1953a98f67961f0,df7ef1745517dff93dc3e9510bab830e73893353..26aaa3cd951a1373b42779fe9cc1baf1684a6c3b
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,14 -1,11 +1,11 @@@
- C Merge\sall\srecent\strunk\senhancements\sand\sfixes\sinto\sthe\sbegin-concurrent\sbranch.
- D 2015-09-24T15:17:54.922
- F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
- F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
- F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 -C Update\smakefiles\sto\sremove\sall\suses\sof\s"awk"\s-\sto\smake\sbuilding\sSQLite\seasier\non\sWindows\ssystems.\s\sThe\sonly\srequirements\snow\sare\stclsh,\sa\sC\scompiler,\sand\ncommon\sfile\sutilities.
 -D 2015-10-14T20:03:00.297
++C Merge\sin\sthe\s3.9.0\schanges\sfrom\strunk.
++D 2015-10-15T07:44:58.901
+ F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
+ F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
+ F Makefile.msc 9660c072f65b2742595687b30f6d9ae55001ae06
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
+ F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
- F addopcodes.awk 694f522754f0a32dc53bc73ccebf02f28ab10a54
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
@@@ -282,19 -280,19 +280,19 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 82ba91898af438372d2cac20c16549ad36eef2bd
 -F src/btree.c 0b74bc28b2dc907cba03b5b4b3b81584273be699
 -F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
 -F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
++F src/btree.c 8853e6dab83f485d3f61a61f9d9a1975ab20b6af
 +F src/btree.h cd4946a0a00f84e974a10ffd09d53cfbfab758f6
 +F src/btreeInt.h df0e92901c6fbb01aa8fab3cfbcdaaba2654fd04
- F src/build.c a5b54106a7f81235ce55e0440cfb441b8c075793
++F src/build.c 569313d3777bfcb2dfc89f243d76efd158959325
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
- F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
+ F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
- F src/delete.c 371df4fc86e96efeaed3d37565aef77f956be109
- F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863
+ F src/delete.c 35c939eb8bacc9dd8a6715964e5f69feb8c20e44
+ F src/expr.c b89dfbb8a385a45411c487355597c01f4ea4c882
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
+ F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
  F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
  F src/global.c 508e4087f7b41d688e4762dcf4d4fe28cfbc87f9
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
@@@ -340,12 -338,12 +338,12 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
- F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
+ F src/select.c 0bc9cd2e1cacfdc9cdc9a83884cc100f166e80a4
+ F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
+ F src/sqlite.h.in dc35357824c6bb84a04acd4e99dee3e07299a8c6
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
- F src/sqliteInt.h c530296105917134620d3fd779d9f44add2c23d3
+ F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
 -F src/sqliteInt.h e21cc96bc24161df7373f6b24367cf580496889d
++F src/sqliteInt.h dfc94932c4f7f1bb0eafdbea1f8cd6645fba05cf
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -364,7 -362,7 +362,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 24f1c8415e57d709ae603cbde42a93990192c8fd
 -F src/test_config.c ada6f38b0acb6722fb7f0ed8c54fd66df41085b9
++F src/test_config.c fe04d07d9b097a26f008fbe29b0bcd72e239c555
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
@@@ -399,28 -397,28 +397,28 @@@ F src/threads.c bbfb74450643cb5372a43ad
  F src/tokenize.c 83c6ed569423a3af83a83973b444cf7123be33a6
  F src/treeview.c 154f0acc622fa3514de8777dcedf4c8a8802b4ce
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c eb7ab3ff2928628692a4f14be397c95f4a681d97
+ F src/update.c dc37664095ca8604293ff1de2d9a547c6efb5e6e
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 1e0bf8d6a2308ce916d444ef399921407fd5d972
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
- F src/vdbe.c 34fb6d592a9f9591f365811441b5cd81424d7f6f
++F src/vdbe.c 9e42ca33dbf7b717dc1e918cda4241b86249e7c6
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
  F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeaux.c 4988b83d1e1989ee554b2fa4ca18f3606a78437c
- F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
+ F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
  F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
- F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
+ F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c fd2351d771df2e147b0d6a952314078fa20af171
 +F src/wal.h 361b16891d2772294b138054c84f5a3bad6e9d05
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c d5eed2584542e7f3bc78ddef7809a9d76d14d811
+ F src/where.c 4c4646675e794ac71e701289edefd7cd81bac844
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
- F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
+ F src/wherecode.c cdfff200d065e7fb1af827b3274ed46b10a91d65
+ F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1335,10 -1332,12 +1335,12 @@@ F test/without_rowid6.test 1f99644e6508
  F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
  F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
  F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
- F tool/build-all-msvc.bat 761d8c82a1a529261291812732a853a1b4256d85 x
+ F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
+ F tool/GetTclKit.bat f8159730269bdbf5c334383134011dda4df45511
 -F tool/addopcodes.tcl 7cc82ecca456a6b3148abf492b0419b83140881a
++F tool/addopcodes.tcl 2b5886e104b8d9ccee8ead9b873c99d2144644c9
+ F tool/build-all-msvc.bat 2b1703b322da121e56b955cb58de091107f777c3 x
  F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
  F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
- F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
  F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
  F tool/fast_vacuum.c 5ba0d6f5963a0a63bdc42840f678bad75b2ebce1
  F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
@@@ -1351,7 -1350,9 +1353,9 @@@ F tool/lempar.c 3617143ddb9b176c3605def
  F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
  F tool/logest.c eef612f8adf4d0993dafed0416064cf50d5d33c6
  F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
 -F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
 +F tool/mkkeywordhash.c ff6fc41e733204e289b38b9cd3808701725c6793
+ F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
+ F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
@@@ -1391,7 -1391,8 +1394,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P fc4d1de8aeb39a4c0ea9275a0bd2447535f1a955 c6ab807b72ddfc1462f61aa91442b6fac04ace8a
- R e076748ccf585cd56005015a1eafaf6b
 -P 7d77233389c595237d5b3d244b8aeca1524290c0 6d9cdb931cf4e2f0830184cff32e441e4966bd7e
 -R b35466bcd9913c829dbd9e3ab76bfe7d
 -T +closed 6d9cdb931cf4e2f0830184cff32e441e4966bd7e
++P c63c1e15f8cc8981aa4dbec82d510ed70cd09797 4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8
++R e25651cd110a4e24fff8bcf73faada51
  U drh
- Z e239d96f0cdfa77c62294b132f37cf69
 -Z 46c8c0b0de353ffbb08761cc90f08587
++Z 62684fe4eee441730a8c859a36c8880e

diff --cc manifest.uuid
index deb3655cf2dfcc5dc0dffd1ca33f10bcc9f8d737,81258b88be6b044928982a26c0c857a92b2c8b8f..c1be1007fcc8974de91bbd8afcc6279968f2337e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c63c1e15f8cc8981aa4dbec82d510ed70cd09797
 -4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8
++5c3a2a6ed64f4d0e10238720bc2e4ae3af3eded3

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
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 tool/addopcodes.tcl
index 0000000000000000000000000000000000000000,46675cb258ece3aa423b0b8712be1406f83b0094..757eb699384afbecd9e3d70ef4f8d8ac9a65a35a
mode 000000,100644..100644
--- /dev/null
--- 2/tool/addopcodes.tcl
+++ b/tool/addopcodes.tcl
@@@ -1,0 -1,45 +1,47 @@@
+ #!/usr/bin/tclsh
+ #
+ # This script appends additional token codes to the end of the
+ # parse.h file that lemon generates.  These extra token codes are
+ # not used by the parser.  But they are used by the tokenizer and/or
+ # the code generator.
+ #
+ #
+ set in [open [lindex $argv 0] rb]
+ set max 0
+ while {![eof $in]} {
+   set line [gets $in]
+   if {[regexp {^#define TK_} $line]} {
+     puts $line
+     set x [lindex $line 2]
+     if {$x>$max} {set max $x}
+   }
+ }
+ close $in
+ 
+ # The following are the extra token codes to be added
+ #
+ set extras {
+   TO_TEXT
+   TO_BLOB
+   TO_NUMERIC
+   TO_INT
+   TO_REAL
+   ISNOT
+   END_OF_FILE
+   ILLEGAL
+   SPACE
+   UNCLOSED_STRING
+   FUNCTION
+   COLUMN
+   AGG_FUNCTION
+   AGG_COLUMN
+   UMINUS
+   UPLUS
+   REGISTER
++  EXCLUSIVE
++  CONCURRENT
+ }
+ foreach x $extras {
+   incr max
+   puts [format "#define TK_%-29s %4d" $x $max]
+ }