Merge latest trunk changes with this branch.

FossilOrigin-Name: 57bc0194f41dbcd2c343e665e7af475cd4dd7328

diff --cc manifest
index 605728fd861286d2673a65e52c1d5cc959b70494,d07b325859c4516fa51edf27b965e6d2d2dbc786..98f9a5d524f45abd99742d2e6a60fd8dcd228840
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sheader\scomments\sfor\snew\smethods\sin\spager.c.
- D 2015-08-27T19:57:16.810
 -C Add\sthe\sjson_check()\sfunction,\swhich\sreturns\sits\sargument\sif\sthe\sargument\nis\swell-formed\sJSON\sor\swhich\sthrows\san\serror\sotherwise.
 -D 2015-08-28T03:48:04.807
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2015-08-28T09:27:51.910
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e2218eb228374422969de7b1680eda6864affcef
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -279,10 -279,10 +279,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 f48b3ef91676c06a90a8832987ecef6b94c931ee
 -F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 -F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
 -F src/build.c 97f682229876834abad515a0a48759a967999ed0
 +F src/btree.c 88ff0f5bdcd200e4b8cdc2f49a89369112a592d7
 +F src/btree.h 00d4cdb747c4172a5566faf037116985dbbc377e
 +F src/btreeInt.h 171864bcd81635583dab7b8a04b19b454b18ef80
- F src/build.c 1b5814e0eeaba096ae3ee17ebd139d2a25af7250
++F src/build.c bb9335e06a6f308c595e0507ce97daf791735a6e
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
@@@ -342,7 -342,7 +342,7 @@@ F src/shell.c b1f91e60918df3a68efad1e3a
  F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413
- F src/sqliteInt.h 0b77fa98404807709549d43387f9b44e3c69d5b7
 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212
++F src/sqliteInt.h 8657f11e821b15500810020f529f452113fe6532
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -394,13 -394,13 +394,13 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5
- F src/treeview.c c15df00728034549ff92d78ae851b44952736d3b
+ F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f
+ F src/update.c adc8b4b2b6fd2cca2e0d2b803e0cf6956aa3a030
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c bc9dd64b5db544218b871b66243871c202b2781f
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
 +F src/vdbe.c 791a28761cf6176d11ec3e41cdf8e749c65384ff
  F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
  F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
  F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f
@@@ -411,12 -411,12 +411,12 @@@ F src/vdbesort.c f5009e7a35e3065635d891
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
 -F src/wal.c 6fb6b68969e4692593c2552c4e7bff5882de2cb8
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 +F src/wal.c 44ec009f7742a660d3558845e47e870af4542689
 +F src/wal.h 903ef67e17f8b466dc7cfc4186fc23e80be10ff8
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c 66518a14a1238611aa0744d6980b6b7f544f4816
- F src/whereInt.h 880a8599226ac1c00203490d934f3ed79b292572
- F src/wherecode.c 69f19535a6de0cceb10e16b31a3a03463e31bc24
+ F src/where.c 91e73ffc699c140a59baa03a6b7b060db02bed81
+ F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9
+ F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5
  F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1382,7 -1380,7 +1383,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 fd4798cb7af263409c20d3cf81236b830bd68570
- R f446f1e219f1b69d13fe21a44df99a43
 -P 44f103d8862abc2d5613bac04dc2ea8e625b1f40
 -R 204205d2daf18b22608467b1b10a8a77
 -U drh
 -Z 4f534e8322ceee4fbcec765d09d17add
++P 437c7e219d3240767a28f73487bc26c3be3044b3 64abb65d4df11e5b3bcc4afc8e7c18e907c6080a
++R d1f878aab8d7c75cbf15e5d6b4c78c00
 +U dan
- Z 0a2b89af585f5781988dd453201696be
++Z 64a6a9bedfd1c579ad90113faf74b29f

diff --cc manifest.uuid
index da0a46abb34ef505c331c4fd119bfa43c2960822,49f83f8b9f23a79d94a4866dc6b3aca1357d38df..dabc379273e98914eb5c6193313446b78874be6b
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 437c7e219d3240767a28f73487bc26c3be3044b3
 -64abb65d4df11e5b3bcc4afc8e7c18e907c6080a
++57bc0194f41dbcd2c343e665e7af475cd4dd7328

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge