Merge 3.12.0 changes.

FossilOrigin-Name: eef557449cf665aa8deb85674b7db167b389776a

diff --cc manifest
index 8ed7c0648ecb076397c0363d3de3d735518e4835,769e820b332aad0a7cc327c77c015c78797bf560..5b1a17ba3a3e4610ae169a00a907bea6adba2e0d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Merge\sthe\ssqlite3_system_errno()\schange\sfrom\strunk.
- D 2016-03-21T14:52:04.010
 -C Version\s3.12.0
 -D 2016-03-29T10:14:15.762
 -F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
++C Merge\s3.12.0\schanges.
++D 2016-03-29T10:30:24.177
 +F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -298,10 -297,10 +300,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 119943fda9a5bc6c374019f2b2abac5ecb474d27
 -F src/btree.c 577fb5674e2f0aa0a38246afc19e1885a0b8c9b0
++F src/btree.c 2c5e9c747f0757e5c1b3fbc7fd5eb31c3231a709
  F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 213cbf84e99dd834e6ea46615633656d7ef79321
+ F src/build.c 39faaaeecb77eb3936d4bd5024e865e3836ca323
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -317,9 -316,9 +319,9 @@@ F src/hash.c 4263fbc955f26c2e8cdc0cf214
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c e70f8f9e97624a232870ea5486e682c813ac3002
- F src/main.c 7a89a9399b890865c25abc066c97fbd466df36d4
 -F src/main.c 63791c66321f07b5828bb9161b477d5e0b511d7e
++F src/main.c 28c0094829fabdd719001406ba28e1e60b8be4ec
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -338,30 -337,29 +340,30 @@@ F src/os.c 3aee4b94665c127b3a90d1495e0a
  F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c a721d5d9002c4811c48c197cf3d38ba6a0d8f7c6
- F src/os_win.c 745cbd3ec75d67f3e0a41c01e1c1dbd45626e718
 -F src/os_unix.c b1ccb273771f41dbdbe0ba7c1ad63c38ad5972ec
 -F src/os_win.c ff870d89f4cb088a04cbf5ea0cbd9ff1b089ff4a
++F src/os_unix.c 547157dab5f5c0757f07d0814154d4b17f1b01d4
++F src/os_win.c 5c780f4cf21eb5d28eab98b492afc6f27c6edc09
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 38718a019ca762ba4f6795425d5a54db70d1790d
 -F src/pager.h e1d38a2f14849e219df0f91f8323504d134c8a56
 +F src/pager.c 2c38bcb3117c4268a89a26a03a9abf2617002a2f
 +F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
  F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
  F src/pcache.c 647bb53a86b7bbcf55ad88089b3ea5a9170b90df
  F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 -F src/pcache1.c c40cdb93586e21b5dd826b5e671240bd91c26b05
 -F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
 +F src/pcache1.c dc4ad9b31cf603d14b3a90719f3aa874b4925137
- F src/pragma.c 620a6f8c850cc4b42aaa4fcf5ceae531fac027a3
++F src/pragma.c 985f16e7f14032c7e9638f7dc48c3384d17a6a4f
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c 9c56ea254317e27d3a1273fa812b8578b5e2f850
  F src/printf.c 63e6fb12bbe702dd664dc3703776c090383a5a26
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
- F src/select.c 6dd2097bb158efe3b8d68683dcc3b4a49e907a34
+ F src/select.c 7849cee0a01952a9c93cd28989daedfa57731143
  F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in e877f141b15ef68ef28f84714e69d7234f9a071e
 +F src/sqlite.h.in 9bf07e57b44ed96ca05946599aff6d76adf9d481
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h ac21545eed0dc558e2856347a7b7dde8bcd2cc36
- F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
 -F src/sqliteInt.h 3a68b48967a7d62fcb38572d27fd21ab4e4bcca3
++F src/sqliteInt.h a859dcc9d9a5ca4d412926839cc208cfda4279c5
+ F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
@@@ -419,21 -417,21 +421,21 @@@ 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 1cdbff441d627760c0b6ebd67bdb461ad3eeb7e8
 -F src/vdbe.c cd990451b504507b455cc649d46dad51f2835a67
++F src/vdbe.c 53884a06ae135f9ae0f3d3390e6675d4c51f2823
  F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
  F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
 -F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
 +F src/vdbeapi.c 334db1c072f54fa5bb85bf552046d4397c5534f6
  F src/vdbeaux.c c8dd3e4e932bede6363b380519d05c0557ad27ce
  F src/vdbeblob.c 3b570b730109e8f653d9d2081649f6e7015113db
  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 c09752cafff70ccac871bd53dd7adc9b7331c919
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
  F src/where.c fe7925faafbe9a458972035c0bb4753d672f04ed
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
@@@ -522,12 -520,12 +524,12 @@@ F test/btree01.test e08b3613540145b353f
  F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
  F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
- F test/capi3.test 860dafdc04f651a67781018cb1a0b179d22d7d15
+ F test/capi3.test f0c66919e43d42e1572a69be039e4527a931b00f
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
- F test/capi3c.test b28ec47692f0fc50eb61b2d464d8d52e816b3732
+ F test/capi3c.test 0b9edb0c2156a964b9271cd5ea7ae56736cc2fcb
  F test/capi3d.test 485048dc5cd07bc68011e4917ad035ad6047ab82
  F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
  F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
@@@ -890,12 -887,12 +892,12 @@@ F test/mallocI.test a88c2b9627c8506bf47
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  F test/mallocK.test 27cb5566a6e5f2d76f9d4aa2eca45524401fd61e
  F test/mallocL.test fb311ff80afddf3b1a75e52289081f4754d901dc
 -F test/malloc_common.tcl aac62499b76be719fac31e7a3e54a7fd53272e7f
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl 8d368ee0b9d77c9643b174448f137c18b68e49f4
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
 +F test/memdb.test c46019291625650d71416e770f6a54a281a1a98f
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
- F test/memsubsys1.test 812cb1a29178d6819328ade63c23d6c31025da18
 -F test/memsubsys1.test 6d268d0ae90f8d61a2356a1838665654d83de518
++F test/memsubsys1.test b6037a276f95c88d029868b12c80ff08dbb78700
  F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -1462,7 -1459,10 +1464,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 c73b5b9ccf3dcf48f403c866423bebbdc45d2b28 4bd12b57ea177cfb1f44d54bfa7aedfb8a8c0c64
- R bd073a087bdef64b2c74e895089bfab0
 -P f6a88cccbc0c62a0b453f4711298c9d5e1882b18
 -R 345c74a0cb9568a53ff6b8825c4a812b
 -T +bgcolor * #d0c0ff
 -T +sym-relaese *
 -T +sym-version-3.12.0 *
++P 063f1b3705625b2f115af8e909d86705b892b529 e9bb4cf40f4971974a74468ef922bdee481c988b
++R e27a7e6077194133d8bd669ef8c3c94c
  U drh
- Z 07b1c17c1351686cd131d8af15c82d0d
 -Z 9c957a50c25c5de44ce9010b47906f30
++Z 4f7987322815e5acc3a71c7184765993

diff --cc manifest.uuid
index 61d34a3a18e413cf5aeb615186f6477811687f2a,21845f2bab9c458df3411532a5d21f45304d684b..667f56f03b770e7ff4a8cad4970330660dc0486e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 063f1b3705625b2f115af8e909d86705b892b529
 -e9bb4cf40f4971974a74468ef922bdee481c988b
++eef557449cf665aa8deb85674b7db167b389776a

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/memsubsys1.test
index efceeb89eba6dfa94adddb4f653eaa275b28d652,36427f9bae0b001d58617c951c7bfda10f7520c3..a948b9da73be249a6e6dfb268f2ec111ed8b44d1
--- 1/test/memsubsys1.test
--- 2/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@@ -259,15 -252,13 +259,15 @@@ do_test memsubsys1-7.3 
    set pg_used [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_USED 0] 2]
    expr {$pg_used<24}
  } 1
 -do_test memsubsys1-7.4 {
 -  set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
 -} 0
 -do_test memsubsys1-7.5 {
 -  set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
 -  expr {$maxreq<(4100 + 8200*[nonzero_reserved_bytes])}
 -} 1
 +if !$::sqlite_options(enable_purgeable_pcache) {
 +  do_test memsubsys1-7.4 {
 +    set pg_ovfl [lindex [sqlite3_status SQLITE_STATUS_PAGECACHE_OVERFLOW 0] 2]
 +  } 0
 +  do_test memsubsys1-7.5 {
 +    set maxreq [lindex [sqlite3_status SQLITE_STATUS_MALLOC_SIZE 0] 2]
-     expr {$maxreq<4100 + 4200*[nonzero_reserved_bytes]}
++    expr {$maxreq<4100 + 8200*[nonzero_reserved_bytes]}
 +  } 1
 +}
  do_test memsubsys1-7.6 {
    set s_used [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_USED 0] 2]
  } 1