Merge 3.12.0 changes.

FossilOrigin-Name: d7381efff47c0a2f307478f196d03df7534f19e3

diff --cc manifest
index 5d23e19f5ee3b1fd48bb8670c4737b7b20ad80c9,769e820b332aad0a7cc327c77c015c78797bf560..b3dc6ba6518e6ea770bd5b1fe9cd90207047e1e9
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\srecent\schanges\sfrom\strunk.
- D 2016-03-21T15:54:46.624
 -C Version\s3.12.0
 -D 2016-03-29T10:14:15.762
++C Merge\s3.12.0\schanges.
++D 2016-03-29T10:36:07.964
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -296,10 -297,10 +297,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c dab12f0a78eefdcd2b17433f5554676d713e5899
 -F src/btree.c 577fb5674e2f0aa0a38246afc19e1885a0b8c9b0
 -F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
 -F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c 39faaaeecb77eb3936d4bd5024e865e3836ca323
++F src/btree.c 108728aecaaa1e5a2ff235e56f94a1bab8fb654b
 +F src/btree.h 248919b5863d041e3931702f922bae62cf613004
 +F src/btreeInt.h ca40607c2c9d4b4b7ded98e3d707b15c2f17f1bf
- F src/build.c 12ad19cfe14c55b24d3f9738edb368edde497475
++F src/build.c 745020bd3d170e2a39df513d3f7ca8fb0f24f633
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -336,12 -337,12 +337,12 @@@ F src/os.c ca10edb445ad2c5fdc7285b49d72
  F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 50103f69121bca969761b821e2b0e393b55fe869
- F src/os_win.c 551d973ada67127430e41d9e514e53f6beb6c5a7
+ F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec
+ F src/os_win.c ff870d89f4cb088a04cbf5ea0cbd9ff1b089ff4a
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
 -F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
 +F src/pager.c 476884ce8d8e845daf88f1b12b8ca446bac5fdc5
 +F src/pager.h bb26afd6fa33f684832895ede771f6459e513e5a
 +F src/parse.y a74adac187a88fb949739aae203939241c06e62b
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
  F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
@@@ -357,8 -358,8 +358,8 @@@ F src/shell.c 5e0ab1e708dc294330ccd8230
  F src/sqlite.h.in e877f141b15ef68ef28f84714e69d7234f9a071e
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h a5e25cd7eb5c7066cd9319c9d8568ac4f5f54dc8
- F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
 -F src/sqliteInt.h 3a68b48967a7d62fcb38572d27fd21ab4e4bcca3
++F src/sqliteInt.h d5699c8422fe250ff96696ea3f468cec1faad39d
+ F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
@@@ -416,9 -417,9 +417,9 @@@ F src/treeview.c e4b41a37530a191579d3c5
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
  F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c cf7dce85ab9af5280b8a45985df2591efbfefe56
+ F src/util.c 8873d696c9ccc4206058c402e09e101f1b81561a
 -F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
 -F src/vdbe.c cd990451b504507b455cc649d46dad51f2835a67
 +F src/vacuum.c c1a94413f8fa9d9b2cbe3af9a89377f777be676c
- F src/vdbe.c c96ca245b38be7a7798b512f3418a921b7db314e
++F src/vdbe.c ada5fe38c19447b270548c7b3dca086effa7eedc
  F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
  F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
  F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
@@@ -427,10 -428,10 +428,10 @@@ F src/vdbeblob.c 3b570b730109e8f653d9d2
  F src/vdbemem.c fe76c1f866de362d9b8332e59d74aa44f6560d69
  F src/vdbesort.c 307460bfa4de4d1c3901fcd42089159131e34062
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
- F src/vtab.c fd69fd398e23e57ea4ea377d8a44b6998fc569c7
+ F src/vtab.c 23b6cdfa996152d43b390504ed4a942c8caf3a00
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 -F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
 +F src/wal.c 12931b1b6d91651c932b0a80571c649bb862a187
 +F src/wal.h 327e94c3e366154f52a8d9be9be0ea790cc4e08c
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
  F src/where.c fe7925faafbe9a458972035c0bb4753d672f04ed
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
@@@ -1461,7 -1459,10 +1462,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 a7978ab6d26b865f55c6b3e86ba3a24777a3c1f0 902f221754f3cc6fb4ae049c135f85efce604ed3
- R 3d99d53779e8a1be1ff4c3c336814f62
 -P f6a88cccbc0c62a0b453f4711298c9d5e1882b18
 -R 345c74a0cb9568a53ff6b8825c4a812b
 -T +bgcolor * #d0c0ff
 -T +sym-relaese *
 -T +sym-version-3.12.0 *
++P 8ee7d346c1d9beedd02bf11d0a45810985a45480 e9bb4cf40f4971974a74468ef922bdee481c988b
++R f0b22467176ee18d86a13e1b0279a8ea
  U drh
- Z cad688af00172239d8afdc418e2a0374
 -Z 9c957a50c25c5de44ce9010b47906f30
++Z db9cdcc9060a4c05b248d7435b13e406

diff --cc manifest.uuid
index 787e3a0660aeca518b8d0184816d37e44a9b962b,21845f2bab9c458df3411532a5d21f45304d684b..8b69dd2bb42762fe81e49820e2c641a81bbe1cff
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8ee7d346c1d9beedd02bf11d0a45810985a45480
 -e9bb4cf40f4971974a74468ef922bdee481c988b
++d7381efff47c0a2f307478f196d03df7534f19e3

diff --cc src/btree.c
Simple merge

diff --cc src/build.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge