Merge the latest changes from trunk.

FossilOrigin-Name: 14ea84003600ada6f4605e47028cb72fe621a14bcce3637ad48b1512dcce41cd

diff --cc manifest
index a97d5826ea9ede3c3bbe6cfa269bb27493ed9317,954fc9afccecdeaad54cf140b3ef9706c79dfcf2..9f8c2319689104d834b9ef8545c7fff2dcb1ff0c
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\schanges\sfrom\sthe\s3.18.0\srelease.
- D 2017-03-30T20:35:30.520
 -C Fix\sthe\sbuild\sso\sthat\sit\sworks\sagain\swith\sSQLITE_OMIT_SUBQUERY.
 -D 2017-05-15T15:12:24.562
++C Merge\sthe\slatest\schanges\sfrom\strunk.
++D 2017-05-15T17:34:23.124
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
+ F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
  F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
- F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
+ F VERSION 0a0e02e16b44ea735b40118fc844311b2ab0d35b25fbeda5120aee62f973f663
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -348,10 -346,10 +350,10 @@@ F src/auth.c 79f96c6f33bf0e5da8d1c282ce
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
- F src/btree.c a6be01292ef0d290dbb768943542a112c5425702fd606099241e2bd7502d6e30
- F src/btree.h d04766565d07aa84f1324f6092a912a34e98f8790d607842ae73a4e45c3047e1
- F src/btreeInt.h b2cdfe83b930ae61c83ff9adc36f1b0aeda53758ab5a0755de5a0aec2be2f3a1
- F src/build.c 3761b2cc63542368fdd39686180fb02574311ec9953195661d4926e1256fdf7a
 -F src/btree.c 8c1fd4cfa2b0bf021386e0a1f4e30b64eea7a2c1bc2e0c3e5901a626b1ab6aa9
 -F src/btree.h 80f518c0788be6cec8d9f8e13bd8e380df299d2b5e4ac340dc887b0642647cfc
 -F src/btreeInt.h a392d353104b4add58b4a59cb185f5d5693dde832c565b77d8d4c343ed98f610
 -F src/build.c 4026a9c554b233e50c5e9ad46963e676cf54dd2306d952aa1eaa07a1bc9ce14f
++F src/btree.c b8ffd067e78704a8bf81b83c60a23987a46dac9aca0c08c3959482dfae02d197
++F src/btree.h 14e99cc2b666beb60322173c761d16b668ec2e07c18bbb74e8a49fe85946f8a0
++F src/btreeInt.h 42c3e3d9534aed0b99ee68678b0311c33134c7c015037a319900eddd148584d6
++F src/build.c ba3f389668754c407805bbc5f8ab140f063ba6b04a6a86f63006b63b3c7319a8
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 47d91a25ad8f199a71a5b1b7b169d6dd0d6e98c5719eca801568798743d1161c
@@@ -392,25 -390,25 +394,25 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
  F src/os_win.c 2a6c73eef01c51a048cc4ddccd57f981afbec18a
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 98a32b803fee30beaebe24ecbbf06bb2f8bc727957c0e410944b4597cbe8e81e
 -F src/pager.c 80893c0860199aebc6efa4f102ab11eebde338b7fdbb0c04d4b04647c2fd62d1
 -F src/pager.h f2a99646c5533ffe11afa43e9e0bea74054e4efa
 -F src/parse.y 0513387ce02fea97897d8caef82d45f347818593f24f1bdc48e0c530a8af122d
++F src/pager.c d82c877615ead80deccac6c7c59f7a875d7e3d7f1ff5652bbc74503d0e05f6d0
 +F src/pager.h 5e7b4e5afdcbdf558c211f27786672b3d2536003d0fb6c4888addb500c826e15
- F src/parse.y f48aeacb59e7f272b042872332af246a97847d234d17dfdacf719b8aa97f7236
++F src/parse.y 21660e5224d1e1635a4ad45ad4365c8f67153b8081b7a11e35629844ecb48ab0
  F src/pcache.c 62835bed959e2914edd26afadfecce29ece0e870
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
- F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
- F src/pragma.c 2b244434e76c7075edbcfd9e4d634899af0944ff01183b126d4671f7407c2368
- F src/pragma.h c9c763958fec92b04125571472c9500b351c5f7f
+ F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc
+ F src/pragma.c 2362670a9d28b71708aecb2b9b10b3f7be71f4c950961c07e81dc400e3ce6371
+ F src/pragma.h 37a1311d0388db480388d7ec09054f7103045eff20d4971f8a433b77f40b9921
  F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
  F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 2496d0cc6368dabe7ad2e4c7f5ed3ad9aa3b4d11cd90f33fa1d1ef72493f43aa
- F src/shell.c ceb2b2f1f958ea2c47a7f37972d0f715fbf9dcf6a34a5e98c886b85e3ce6a238
- F src/sqlite.h.in 723107d97f2345a7c103632169dc61366121c4ab65d75a7d83c6dc0e5bbe5ca4
+ F src/select.c d74b1cde1d9ca6d08bec50b60a5be19440273646bc8ae16648d748c38161d5b7
+ F src/shell.c a37d96b20b3644d0eb905df5aa7a0fcf9f6e73c15898337230c760a24a8df794
+ F src/sqlite.h.in 8dd468837a4f6d76713e3a4cc65bea48095009038593d41040ab46c1b351197f
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
- F src/sqliteInt.h df8fa773ff6d12fc40260b0ef51b6c126040f344f178de2502adfcc1e50bed9c
 -F src/sqliteInt.h aea3aa1b81e0d07d5b1c39b8c5a54a1dc5e4f10136cb63da392aef9eb2a5108b
++F src/sqliteInt.h b7e590bc90ebee66cf79fb41312a7cdbce881b7db316d934c159294ff6087fd5
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -430,8 -428,8 +432,8 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c f65ac717da2618691cf9dad094e6da0219dcd208
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 -F src/test_config.c edcba290248dc18736dd814c9b95863c6762e0b35753048d8cbe5bf65f7abfbb
 +F src/test_config.c d3925a89099af6407929fe642adeb950b7e6150d738b4113b2a62ae3eb95a7cd
- F src/test_delete.c af7eab5702f853fb1c62a5f7665e2234cf1ae17b
+ F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
  F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b
@@@ -465,31 -463,31 +467,31 @@@ F src/test_windirent.c 17f91f5f2aa1bb73
  F src/test_windirent.h 5d67483a55442e31e1bde0f4a230e6e932ad5906
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c dc748c5afcb9e5beb3ef5651bc99a4622e30f6a1
- F src/treeview.c 84d0ac737e1231702679f0289180021e19c5cc186ec413e8dcb704a887c76ec8
+ F src/tokenize.c 1003d6d90c6783206c711f0a9397656fa5b055209f4d092caa43bb3bf5215db5
+ F src/treeview.c 6cf8d7fe9e63fae57dad1bb57f6615e14eac0c527e43d868e805042cae8ed1f7
  F src/trigger.c c9f0810043b265724fdb1bdd466894f984dfc182
- F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
+ F src/update.c c443935c652af9365e033f756550b5032d02e1b06eb2cb890ed7511ae0c051dc
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
+ F src/util.c fc081ec6f63448dcd80d3dfad35baecfa104823254a815b081a4d9fe76e1db23
 -F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
 -F src/vdbe.c 9bac2bc2313ed682e6f48ccff6644d3263341885bfcbb3cdea7b720c722be2d5
 +F src/vacuum.c 8aa1db0b7052269890ac03089ed030eefa88480897915f727703ca74d0676380
- F src/vdbe.c 839999e07f6eaa35d1561ffd9055999938d17f82dc4e0fc52564c21eee385b0f
- F src/vdbe.h caa5346d52bae2a3c8c1dcfa60a7a4dc878a9e3865cb8239da55808b316c8158
- F src/vdbeInt.h 5db089ce18c4feff8820ec6e4cac2d2c82e03d4b1d96f10a6e43832147b8dffe
- F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
- F src/vdbeaux.c 0a2d70e76ffe87869d4280f23477994f747fb0fa21305f4f9afcbdce22e4bafd
++F src/vdbe.c bf4d2b2953c50e8432a7c544a835cd74a358465072e130f3b8e6ef6657759244
+ F src/vdbe.h f7d1456e28875c2dcb964056589b5b7149ab7edf39edeca801596a39bb3d3848
+ F src/vdbeInt.h 1ecdacc1322fdd3241ec30c32a480e328a6f864e532dc53fae8e0ab68121aebf
+ F src/vdbeapi.c dc904b3c5e459727993c2421e653e29d63223846d129fae98adc782b0a996481
 -F src/vdbeaux.c 01dcf59b2a96bd3cc9db8c0d7f266518d113587459a2b3316279c4f9c90f28a9
++F src/vdbeaux.c 5dfd5adf3c8c803feccb709d2b626759b20bd535abcd36a1c157429dfa29b516
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
- F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
- F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
+ F src/vdbemem.c 2c70f8f5de6c71fb99a22c5b83be9fab5c47cdd8e279fa44a8c00cfed06d7e89
+ F src/vdbesort.c e72fe02a2121386ba767ede8942e9450878b8fc873abf3d1b6824485f092570c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 007513c2ef52472fcdea6a741683d50662e82790
+ F src/vtab.c 35b9bdc2b41de32a417141d12097bcc4e29a77ed7cdb8f836d1d2305d946b61b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 -F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 +F src/wal.c 2858e71b30d521c80949fa10ed6b116367865594
 +F src/wal.h 8659519a248ef0f33e575b20ab04211cebe1f430
  F src/walker.c b71a992b413b3a022572eccf29ef4b4890223791
- F src/where.c e815093e5ee039b6b4eb19b646d22deb1a3a523f
- F src/whereInt.h 2d50c2b74a33be44cb68fdecee30b4d93552f1f4
- F src/wherecode.c 677e95413c472c0b413023b6b69a47f40fce1b04
- F src/whereexpr.c 130cdd1a43af71b19755270fb1224874cf55158c
+ F src/where.c c6352f15be5031907c68bcbde96cad1a6da20e9f4051d10168a59235de9a8566
+ F src/whereInt.h 2a4b634d63ce488b46d4b0da8f2eaa8f9aeab202bc25ef76f007de5e3fba1f20
+ F src/wherecode.c 8ad48867660519e262a401720845dc76934f86f558ec9606335fafcd7a2554f8
+ F src/whereexpr.c e913aaa7b73ffcce66abcea5f197e2c538d48b5df78d0b7bba8ff4d73cc2e745
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -605,13 -603,9 +608,13 @@@ F test/collateA.test b8218ab90d1fa5c59d
  F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151ecac0b95
  F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1
  F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
 +F test/concfault.test 500f17c3fcfe7705114422bcc6ddd3c740001a43
 +F test/concurrent.test 634b6a88f1942f5d68cc89d4d5efa2b11ba7913c
 +F test/concurrent2.test 77d655c6af93e77803b5c926555a838bb21f922f
 +F test/concurrent3.test 0a5f7e3036d1eccf0782d7153ac21f5f222e9468
  F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db
  F test/conflict2.test bb0b94cf7196c64a3cbd815c66d3ee98c2fecd9c
- F test/conflict3.test dec0634c0f31dec9a4b01c63063e939f0cd21b6b
+ F test/conflict3.test a83db76a6c3503b2fa057c7bfb08c318d8a422202d8bc5b86226e078e5b49ff9
  F test/contrib01.test 2a1cbc0f2f48955d7d073f725765da6fbceda6b4
  F test/corrupt.test 141c39ea650c1365e85a49e402fa05cb9617fb97
  F test/corrupt2.test e4964cee73dda57a90958e0087a6b388b1d9cb58
@@@ -1490,7 -1492,7 +1501,7 @@@ F test/zerodamage.test e59a56443d6298ec
  F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
  F tool/GetTclKit.bat 6afa640edc7810725aec61c3076ac617c4aaf0b7
  F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
- F tool/addopcodes.tcl f2e9aba2c2c718624fa14059198456d9e519b925
 -F tool/addopcodes.tcl edbd53806bf20e25af2373ad0c091be4385081c1aa1813b916bf093f94ed8380
++F tool/addopcodes.tcl 247fc242e71ec4e540438351e5f3a31830c908ca29bf91212c192a74fc410a74
  F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
  F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
  F tool/cg_anno.tcl f95b0006c52cf7f0496b506343415b6ee3cdcdd3 x
@@@ -1511,8 -1513,8 +1522,8 @@@ F tool/loadfts.c c3c64e4d5e90e8ba411592
  F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
  F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
  F tool/mkautoconfamal.sh e855df211ecbcc7131dee817110ff386cfb112f7
 -F tool/mkkeywordhash.c f7f3b342211ac6a14258b9726d5b97cf4f548f22
 +F tool/mkkeywordhash.c f5ecfd09b56b8badc644554ed38c86056152b893
- F tool/mkmsvcmin.tcl 95b37e202cbed873aa8ffdbb493b9db45927be2b
+ F tool/mkmsvcmin.tcl cbd93f1cfa3a0a9ae56fc958510aa3fc3ac65e29cb111716199e3d0e66eefaa4
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@@ -1578,7 -1580,7 +1589,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 fd5676fe7f55b3d4fa15ca119af7c064c6f9d053affdfd5e748785e300affbeb 424a0d380332858ee55bdebc4af3789f74e70a2b3ba1cf29d84b9b4bcf3e2e37
- R 8a3124e0042992057676f6d52b73392e
 -P 0f05d7e93a73bbeac0a09bbd614287507355a7d75fc7b98729bcf7607fc8e125
 -R a9e25308f45891c9b24063503aeca595
++P 785c37d9dbdba9f3deedecbdd72f6761428ebfb58e9b9393b9ca4feab3f66f02 bb0d9281588b8cc24bf2f1f10d0c56277004226adaa2ce5037782503b283b45d
++R 2209c7d58b85878752589360dcc54b3d
  U drh
- Z 0aeab5beee1e00e5712a9927c1d615d0
 -Z 8c1e0c69d71e5343091b9dc46bca8976
++Z c0810d00013569d18eac37214e4c8809

diff --cc manifest.uuid
index 226ee648f14124bdf5f6aa19849332ab9ab7d44b,de1332e1c2d20db578118c003f4b665b76d179a1..6e8c4b9c4bcb491a87506eb3c4241db7623b02dc
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 785c37d9dbdba9f3deedecbdd72f6761428ebfb58e9b9393b9ca4feab3f66f02
 -bb0d9281588b8cc24bf2f1f10d0c56277004226adaa2ce5037782503b283b45d
++14ea84003600ada6f4605e47028cb72fe621a14bcce3637ad48b1512dcce41cd

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/parse.y
index 914a8af44a91c185e04b19fc24f296ecd2de4115,522c80548255f1b19913c50049ea3e8dfc576d00..8c500c268d5d4e3e06ac56ffc0c9820b43fa578f
--- 1/src/parse.y
--- 2/src/parse.y
+++ b/src/parse.y
@@@ -238,24 -239,7 +255,6 @@@ columnname(A) ::= nm(A) typetoken(Y). {
  //
  %token_class id  ID|INDEXED.
  
- // The following directive causes tokens ABORT, AFTER, ASC, etc. to
- // fallback to ID if they will not parse as their original value.
- // This obviates the need for the "id" nonterminal.
- //
- %fallback ID
-   ABORT ACTION AFTER ANALYZE ASC ATTACH BEFORE BEGIN BY CASCADE CAST COLUMNKW
-   CONFLICT DATABASE DEFERRED DESC DETACH EACH END EXPLAIN FAIL FOR
-   IGNORE IMMEDIATE INITIALLY INSTEAD LIKE_KW MATCH NO PLAN
-   QUERY KEY OF OFFSET PRAGMA RAISE RECURSIVE RELEASE REPLACE RESTRICT ROW
-   ROLLBACK SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL WITH WITHOUT
- %ifdef SQLITE_OMIT_COMPOUND_SELECT
-   EXCEPT INTERSECT UNION
- %endif SQLITE_OMIT_COMPOUND_SELECT
-   REINDEX RENAME CTIME_KW IF
-   .
- %wildcard ANY.
- 
--
  // And "ids" is an identifer-or-string.
  //
  %token_class ids  ID|STRING.

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc tool/addopcodes.tcl
index eae40b38184a7e3920db84bf4d4b351c934bcb76,308ddcb6bdc83ccafa2e4f29316c36c8088bfefb..cd5c7f2ec5f76e8b99dc37681704bb3dcd47ffba
--- 1/tool/addopcodes.tcl
--- 2/tool/addopcodes.tcl
+++ b/tool/addopcodes.tcl
@@@ -37,10 -37,9 +37,10 @@@ set extras 
    UMINUS
    UPLUS
    REGISTER
-   EXCLUSIVE
 +  CONCURRENT
    VECTOR
    SELECT_COLUMN
+   IF_NULL_ROW
    ASTERISK
    SPAN
    SPACE