Merge enhancements from trunk.

FossilOrigin-Name: fc4d1de8aeb39a4c0ea9275a0bd2447535f1a955

diff --cc manifest
index 41f481d4e409a88591dd96a03c2be44ace3e33db,e3335b827fbb3b8775f5ab3cdeaf1f2f49ba0eb8..30b857880904abc5a6d5752e13b7a29a14117f11
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sparser\senhancements\sand\sother\simprovements\sand\sbug\sfixes\sfrom\strunk.
- D 2015-09-07T20:22:22.153
 -C Add\stest\scases\sto\scover\sfts5\sintegrity-check\scode.
 -D 2015-09-15T14:39:17.597
++C Merge\senhancements\sfrom\strunk.
++D 2015-09-15T19:16:47.192
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -281,10 -282,10 +282,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 7663d05467277379fd29ae44eb82bcbdee7f618f
- F src/btree.h 00d4cdb747c4172a5566faf037116985dbbc377e
 -F src/btree.c d31008cfbf83e3ae5cb96bae3a00f4b57f244a16
 -F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
 -F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
++F src/btree.c 1c1519fcf31dbcd760568a506934c59d453345fb
++F src/btree.h cd4946a0a00f84e974a10ffd09d53cfbfab758f6
 +F src/btreeInt.h df0e92901c6fbb01aa8fab3cfbcdaaba2654fd04
- F src/build.c 0620be86a9ad5acbeb3b3d757c06559d4fd26c27
++F src/build.c a5b54106a7f81235ce55e0440cfb441b8c075793
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -326,12 -327,12 +327,12 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c 76f493ed71c4154338049dee1bf6e47f69c74a55
  F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4784012f80b2197c61ff6eaf4f5c7026d93253fd
 -F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
 -F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
 +F src/pager.c 06e10a0b736ba22df52e0f56fa67a42de41a0445
 +F src/pager.h 244606cccd4293a2bc4be20bb37bf730028c5c18
 +F src/parse.y 0dcce0ae4e106cdaad4053f73b3bc2dedca9c6d6
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c bf2afe64a3dedb8643c8dcbd94a145cc80ab2a67
+ F src/pcache1.c a0c0bb29f7bd720743a16a95eb5dedba3ade15bc
  F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
@@@ -341,10 -342,10 +342,10 @@@ F src/resolve.c 3126f7694b8ce0f97282d7d
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2
  F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
+ F src/sqlite.h.in 50f83145c6543000b7d27525ecaec59a23d8280b
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h 56a362369786fd1b49dbf6d49b6d7f8167af540d
+ F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
++F src/sqliteInt.h c530296105917134620d3fd779d9f44add2c23d3
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -398,27 -399,27 +399,27 @@@ F src/threads.c 6bbcc9fe50c917864d48287
  F src/tokenize.c 83c6ed569423a3af83a83973b444cf7123be33a6
  F src/treeview.c 154f0acc622fa3514de8777dcedf4c8a8802b4ce
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 3c5bc9570df3bfafa0db36828406a8a14e4c426e
+ F src/update.c eb7ab3ff2928628692a4f14be397c95f4a681d97
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
- F src/vdbe.c 8e1d159743af4b17fce88037a46d68b280aaa729
++F src/vdbe.c 34fb6d592a9f9591f365811441b5cd81424d7f6f
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
- F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
- F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
+ F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
+ F src/vdbeapi.c 0d890f57caf143b114a95ce699e59af51359c508
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeaux.c 4988b83d1e1989ee554b2fa4ca18f3606a78437c
  F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
  F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 5a86298540935981eea840050f66e516dbe536af
 -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 ed1cd1cb0434bca9f4a5379582c637bf393b34ac
- F src/whereInt.h 292d3ac90da4eab1e03ac8452f1add746bcafaa1
- F src/wherecode.c 6ac8599523f4840d9efac335329f627ebf3f79fd
+ F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70
+ F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
+ F src/wherecode.c 186b493599000e640203be0a441223b395dabd24
  F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1386,7 -1387,7 +1390,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 a9b84885aa572b7f92e5aafa246af328d13e3e6e 99b992fa840707711d99f8d05b62412f7008cd93
- R 1f63598c79312b65d8d15c45f84006b8
 -P eade355fafec558fc13dc4b08ca0b07713a2cd84
 -R 1694ed50f41ea37a05fbcbd009cf49d5
 -U dan
 -Z ab887f4a44598b0175c78de8cb058da9
++P 9cf3e51bcce1268dbb22cc8fa77160db3cb72746 1d018c35b9e81982df036f5e62a4a42219b54e02
++R 1d14b270775e001f1b8ca861860001e8
 +U drh
- Z f300497e9766a2b3b13269e90f17caa1
++Z bf5d5ac6ba09452f8091128d189ef356

diff --cc manifest.uuid
index aa27636526d6d317d0ece0e2b6ce0a94979fb203,7bd70ebd90075dfd67309618a7cd84b1aaa607f6..71622bcab31f62f329845bfb70efb2d9f8c54eec
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9cf3e51bcce1268dbb22cc8fa77160db3cb72746
 -1d018c35b9e81982df036f5e62a4a42219b54e02
++fc4d1de8aeb39a4c0ea9275a0bd2447535f1a955

diff --cc src/btree.c
Simple merge

diff --cc src/btree.h
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/wal.c
index 23281740ed60eb98cde5354e5124429dde73ab51,d87d2c17ce96500d20948dc630811df1b3b90d65..1ac3b215c8eebf2575f4fd17ae40d6fa7188cb3a
--- 1/src/wal.c
--- 2/src/wal.c
+++ b/src/wal.c
@@@ -2493,10 -2459,11 +2493,11 @@@ int sqlite3WalFindFrame
    /* If expensive assert() statements are available, do a linear search
    ** of the wal-index file content. Make sure the results agree with the
    ** result obtained using the hash indexes above.  */
 -  {
 +  if( rc==SQLITE_OK ){
      u32 iRead2 = 0;
      u32 iTest;
-     for(iTest=iLast; iTest>0; iTest--){
+     assert( pWal->minFrame>0 );
+     for(iTest=iLast; iTest>=pWal->minFrame; iTest--){
        if( walFramePgno(pWal, iTest)==pgno ){
          iRead2 = iTest;
          break;