Merge changes from the 3.18.0 release.

FossilOrigin-Name: 785c37d9dbdba9f3deedecbdd72f6761428ebfb58e9b9393b9ca4feab3f66f02

diff --cc manifest
index 6cdd069a22b260272ee1176f433edec2eca2d196,ca56437574f69bd8b4085d72b9cb24b6137696bf..a97d5826ea9ede3c3bbe6cfa269bb27493ed9317
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\srecent\senhancements\sfrom\strunk.
- D 2017-03-24T15:09:47.005
 -C Version\s3.18.0\sRelease\sCandidate
 -D 2017-03-28T18:48:43.315
++C Merge\schanges\sfrom\sthe\s3.18.0\srelease.
++D 2017-03-30T20:35:30.520
  F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@@ -406,11 -402,11 +406,11 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
  F src/select.c 2496d0cc6368dabe7ad2e4c7f5ed3ad9aa3b4d11cd90f33fa1d1ef72493f43aa
- F src/shell.c ce39c4bbbaa02484cb45141034fd363c3bac80a6aa22b0bb3cecea1c6a4c0979
+ F src/shell.c ceb2b2f1f958ea2c47a7f37972d0f715fbf9dcf6a34a5e98c886b85e3ce6a238
  F src/sqlite.h.in 723107d97f2345a7c103632169dc61366121c4ab65d75a7d83c6dc0e5bbe5ca4
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 33e415da02eea725392ed9a9bf00cac7a19fed0c1f75678e6b23a3aa0ba178e9
+ F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
 -F src/sqliteInt.h a530e5baf5e559154d5c2e5cc57471bc780a7af4cd0a5d72750b1d850fef1e22
++F src/sqliteInt.h df8fa773ff6d12fc40260b0ef51b6c126040f344f178de2502adfcc1e50bed9c
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -471,12 -467,12 +471,12 @@@ F src/trigger.c c9f0810043b265724fdb1bd
  F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c ca8440ede81e155d15cff7c101654f60b55a9ae6
 -F src/vacuum.c 1fe4555cd8c9b263afb85b5b4ee3a4a4181ad569
 -F src/vdbe.c f1acf5744cef62cbfd0b503d84289f840b6cdc980ac47b0d9632dfdb89cc79eb
 +F src/vacuum.c 8aa1db0b7052269890ac03089ed030eefa88480897915f727703ca74d0676380
- F src/vdbe.c 9a6b75f8265756bf49c776fa9f561b0c13a123064734e8237586e4c4c11897b6
- F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
- F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
++F src/vdbe.c 839999e07f6eaa35d1561ffd9055999938d17f82dc4e0fc52564c21eee385b0f
+ F src/vdbe.h caa5346d52bae2a3c8c1dcfa60a7a4dc878a9e3865cb8239da55808b316c8158
+ F src/vdbeInt.h 5db089ce18c4feff8820ec6e4cac2d2c82e03d4b1d96f10a6e43832147b8dffe
  F src/vdbeapi.c 5b08d82592bcff4470601fe78aaabebd50837860
 -F src/vdbeaux.c ecd0468611925d218e1eb4b3f538907904b136f0e15e333291a232b521bfcef1
 +F src/vdbeaux.c 0a2d70e76ffe87869d4280f23477994f747fb0fa21305f4f9afcbdce22e4bafd
  F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
  F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
@@@ -1368,8 -1360,8 +1368,9 @@@ F test/triggerC.test 302d8995f5ffe63bbc
  F test/triggerD.test 8e7f3921a92a5797d472732108109e44575fa650
  F test/triggerE.test 15fa63f1097db1f83dd62d121616006978063d1f
  F test/triggerF.test 55b1eb13433997faac3a4948c1d8252f6c8c636b
+ F test/triggerG.test 175cafdc6399d85231a09e82e051b0e45a2fd1f23dd08ae715bc359716149ab6
  F test/tt3_checkpoint.c 9e75cf7c1c364f52e1c47fd0f14c4340a9db0fe1
 +F test/tt3_core.c 8cd89ead95410f70e7fb02c79f1e040f9c5ad5cf
  F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
  F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
  F test/tt3_stress.c c57d804716165811d979d4a719e05baccd79277f
@@@ -1577,7 -1569,10 +1578,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 50fb1eb368f14e4ddce2da875601c227f9f937fd c5441d2df2526723f72610cc14dd243223663979e67ecdd76fe06fcd366f2b29
- R cb23130cd73bf8b87b96abf4a0e40c76
 -P 8469fc0d48d6af0accef9b8a84e08ad2ca32351907510d177b4ca4815c1ea7cb
 -R e1b145e92e118b2bc2de7100fb7561b5
 -T *branch * version-3.18
 -T *sym-version-3.18 *
 -T -sym-trunk *
++P fd5676fe7f55b3d4fa15ca119af7c064c6f9d053affdfd5e748785e300affbeb 424a0d380332858ee55bdebc4af3789f74e70a2b3ba1cf29d84b9b4bcf3e2e37
++R 8a3124e0042992057676f6d52b73392e
  U drh
- Z e5649ef618566f41fb419552c48628f4
 -Z 2998f3cf8a15fbd1f3dc49f1b039f0d5
++Z 0aeab5beee1e00e5712a9927c1d615d0

diff --cc manifest.uuid
index e33520b19dfaa6f50c2466abc13369739c47d8cd,5619e48c7b5119c7bb9b8194ed1dbbdbee16be7e..226ee648f14124bdf5f6aa19849332ab9ab7d44b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fd5676fe7f55b3d4fa15ca119af7c064c6f9d053affdfd5e748785e300affbeb
 -424a0d380332858ee55bdebc4af3789f74e70a2b3ba1cf29d84b9b4bcf3e2e37
++785c37d9dbdba9f3deedecbdd72f6761428ebfb58e9b9393b9ca4feab3f66f02

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge