Merge all recent enhancements from trunk.

FossilOrigin-Name: a15c49aed09a6f431022bc73aa98b04165649192

diff --cc Makefile.in
index fc8f2ffb8a56e4d80758f95010fea06737ddc460,2606b5a654fb01f93b27a40148edacb8b597a3f6..47bc883caf3d5b110dcd7e782669d2ffdf4c2536
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -341,9 -344,10 +344,13 @@@ SRC += 
  SRC += \
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
-   $(TOP)/ext/sqlrr/sqlrr.c \
 +SRC += \
 +  $(TOP)/ext/sqlrr/sqlrr.h \
++  $(TOP)/ext/sqlrr/sqlrr.c
+ SRC += \
+   $(TOP)/ext/session/sqlite3session.c \
+   $(TOP)/ext/session/sqlite3session.h
+ SRC += \
    $(TOP)/ext/rbu/sqlite3rbu.h \
    $(TOP)/ext/rbu/sqlite3rbu.c
  SRC += \

diff --cc main.mk
index 57a75d601823544e80579efe4bb7d1113eefcf9a,1e791416d8637fad0814b76ade21bb58809fb412..cb69344dd7c80a4b94a46f1d711d96660132f152
--- 1/main.mk
--- 2/main.mk
+++ b/main.mk
@@@ -222,8 -224,9 +224,12 @@@ SRC += 
    $(TOP)/ext/rtree/sqlite3rtree.h \
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
 +SRC += \
++  $(TOP)/ext/sqlrr/sqlrr.h \
 +  $(TOP)/ext/sqlrr/sqlrr.c
+ SRC += \
+   $(TOP)/ext/session/sqlite3session.c \
+   $(TOP)/ext/session/sqlite3session.h
  SRC += \
    $(TOP)/ext/userauth/userauth.c \
    $(TOP)/ext/userauth/sqlite3userauth.h 

diff --cc manifest
index 5b1a17ba3a3e4610ae169a00a907bea6adba2e0d,e8e1304008e20371961fb11929cd0a65f1ef79e0..7576435fdbde53f23721f3f8a826d71c9cf802a8
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\s3.12.0\schanges.
- D 2016-03-29T10:30:24.177
- F Makefile.in 3aee0ba902634c52493914df76b40cedcd99b678
 -C Add\sthe\sSQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION\smethod\sfor\senabling\s\nsqlite3_load_extension()\swhile\sleaving\sthe\sload_extension()\sSQL\sfunction\ndisabled.
 -D 2016-04-21T02:27:56.575
 -F Makefile.in eba680121821b8a60940a81454316f47a341487a
++C Merge\sall\srecent\senhancements\sfrom\strunk.
++D 2016-04-21T15:35:21.927
++F Makefile.in 2e92e1ae249f32660fb52f61de0f3b6844cfe7b9
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
+ F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION c6b1f51809551d60ad001e6d87cf3ab2c7f54b6f
+ F VERSION 5d234da9b5dae329fab75ff75884cfe0a9cb3fda
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -272,16 -272,35 +272,38 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 9c5777af3d2921c7b4ae4954e8e5697502289d28
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
+ F ext/session/changeset.c 4ccbaa4531944c24584bf6a61ba3a39c62b6267a
+ F ext/session/session1.test 98f384736e2bc21ccf5ed81bdadcff4ad863393b
+ F ext/session/session2.test 284de45abae4cc1082bc52012ee81521d5ac58e0
+ F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
+ F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
+ F ext/session/session5.test 716bc6fafd625ce60dfa62ae128971628c1a1169
+ F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
+ F ext/session/session8.test 8e194b3f655d861ca36de5d4de53f702751bab3b
+ F ext/session/session9.test 5409d90d8141881d08285ed1c2c0d8d10fb92069
+ F ext/session/sessionA.test 1feeab0b8e03527f08f2f1defb442da25480138f
+ F ext/session/sessionB.test 886252dcb7e692e62ef7e357456200912e367823
+ F ext/session/sessionC.test 97556f5164ac29f2344b24bd7de6a3a35a95c390
+ F ext/session/sessionD.test d4744c78334162851d2a2f285c7e603e31b49aa2
+ F ext/session/sessionE.test e60a238c47f0feb3bb707e7f35e22be09c7e8f26
+ F ext/session/sessionF.test c2f178d4dfd723a5fd94a730ea2ccb44c669e3ce
+ F ext/session/sessionG.test 01ef705096a9d3984eebdcca79807a211dee1b60
+ F ext/session/session_common.tcl a1293167d14774b5e728836720497f40fe4ea596
+ F ext/session/sessionfault.test d52cbb7bee48cc8ee80335e07eb72fcb6b15eb40
+ F ext/session/sessionfault2.test ac1dfd77a0fb0ea310aee40a16645ef1b66d3f88
+ F ext/session/sqlite3session.c beb300cd1b5c5054062c8e6e807b10475e363410
+ F ext/session/sqlite3session.h 64e9e7f185725ef43b97f4a9a0c0df0669844f1d
+ F ext/session/test_session.c 464f2c8bf502795d95969387eb8e93f68c513c15
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
  F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
  F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 156d1e543ee2c9008aab4a32c094e47f9820b265
 -F main.mk a283660f75c3c4b75d8c9d12a40fa38a066eee9d
++F main.mk 66df81fee9459eab305ba09f95acf5457d1a7c55
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -300,10 -319,10 +322,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 2c5e9c747f0757e5c1b3fbc7fd5eb31c3231a709
 -F src/btree.c 3ae6aea66cc4e13d30162ff0d0d43c7088e34abf
++F src/btree.c 134f1b049d65b6598542bc2a2c209c6d38b5f239
  F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 39faaaeecb77eb3936d4bd5024e865e3836ca323
+ F src/build.c 42e8ee74dfa3a4b99bfb2c201f8a66ab50688d95
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -318,10 -337,10 +340,10 @@@ F src/global.c c45ea22aff29334f6a9ec549
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 723d5d708cdb61bdd47c00b9f07c75be45aefc09
+ F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
- F src/loadext.c e70f8f9e97624a232870ea5486e682c813ac3002
- F src/main.c 28c0094829fabdd719001406ba28e1e60b8be4ec
+ F src/loadext.c 8b3a73f0624c5f7cadbd5cb89940783bee1d39a6
 -F src/main.c 405d13e3a4f7c5add9fb27702ae70ed0a6e32cca
++F src/main.c cf5f2b15a5cb6cb7e6a0c727611fa857fbc59b24
  F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -336,38 -355,37 +358,38 @@@ F src/mutex_noop.c 9d4309c075ba9cc7249e
  F src/mutex_unix.c 27bb6cc49485ee46711a6580ab7b3f1402211d23
  F src/mutex_w32.c 5e6fe1c298fb5a8a15aaed4161d5759311431c17
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
- F src/os.c 3aee4b94665c127b3a90d1495e0af7b84d3d16a5
- F src/os.h 91ff889115ecd01f436d3611f7f5ea4dc12d92f1
 -F src/os.c 4d83917f072ad958fba9235136fa2ed43df47905
++F src/os.c bb97ef31f4674b0bb57d13a981835db7dc1da677
+ F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 547157dab5f5c0757f07d0814154d4b17f1b01d4
- F src/os_win.c 5c780f4cf21eb5d28eab98b492afc6f27c6edc09
 -F src/os_unix.c d0b41a47eb5f0dc00e423a1723aadeab0e78c85f
 -F src/os_win.c 1997a873bfc8296a701bd8e2df8c3d5da5afe956
++F src/os_unix.c 4e279d4164c0929648f20c7fd8aafae079fc8c32
++F src/os_win.c 8aeedf6a069b3d8e2acbc1c7077240085445d868
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c 2c38bcb3117c4268a89a26a03a9abf2617002a2f
- F src/pager.h ff4c0c4bdf5e0e1d6a6c004313e240822ceee4a1
- F src/parse.y 5ea8c81c5c41b27887f41b4a7e1c58470d7d3821
 -F src/pager.c d20fa46d5beda38095be6070dd4c59e502817c72
 -F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
++F src/pager.c 1b5c2b76645d294825a8280e7e9996d44448e222
++F src/pager.h 7b85589162a781d75fb62c4750ba31ddce9500c5
+ F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
  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 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 7849cee0a01952a9c93cd28989daedfa57731143
- F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
- F src/sqlite.h.in 9bf07e57b44ed96ca05946599aff6d76adf9d481
+ F src/select.c 30217121bdf6b587462150b8ee9e1467f7a6036b
+ F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
 -F src/sqlite.h.in 9984129d86243424b765fcb3f147c697bd20bb54
++F src/sqlite.h.in 42b0c884153a175d4e5a1a45b5e404ea35379b06
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h a859dcc9d9a5ca4d412926839cc208cfda4279c5
 -F src/sqliteInt.h ec538389481a3d093f07fb344c5a9dc988042304
++F src/sqliteInt.h 02f1f63a3cac598bf6ed6e08a2d042d933d6800d
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
- F src/test1.c 51262b6117900de4f5179d77c0b1f29fcaf6d05a
+ F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
 -F src/test1.c abc10e3e81258835aeb59616685d7369ba99ad1e
++F src/test1.c a18cb6138b5d33b085e71136081ece72fc6d1bfc
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@@@ -382,9 -400,9 +404,9 @@@ F src/test_backup.c 2e6e6a081870150f20c
  F src/test_bestindex.c 29af3cc3b963ffe5760c85d142b9b3e5302c1e3d
  F src/test_blob.c b2551a9b5573232db5f66f292307c37067937239
  F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f
- F src/test_config.c cb86019c5ce4943c3a7b6781ea4c9411355f90c3
 -F src/test_config.c 7003f6f35134de6f19c6588f44783e43390ea277
++F src/test_config.c 7711c82d42b9347540b6c8f628560055ff99b42a
  F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852
- F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
+ F src/test_devsym.c 7e73009d5297b603c11c66d7c7d6723d4b5c73e1
  F src/test_fs.c f10f840ca4f8c72e4837908bd8347ac4bcab074b
  F src/test_func.c 37453d346cfcf118774efd5bf6187f7e6a7e3254
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
@@@ -406,42 -424,42 +428,42 @@@ F src/test_rtree.c 43fff4c5a01576d6d213
  F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
  F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
 -F src/test_superlock.c 06797157176eb7085027d9dd278c0d7a105e3ec9
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
- F src/test_syscall.c 2e21ca7f7dc54a028f1967b63f1e76155c356f9b
+ F src/test_syscall.c 4889d374f5a5856b7951f7a67c6401f7b938c6f5
  F src/test_tclvar.c d86412527da65468ee6fa1b8607c65d0af736bc4
  F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
- F src/test_vfs.c 3b65d42e18b262805716bd96178c81da8f2d9283
+ F src/test_vfs.c 4d02f38bfb8f7f273da7ba84bfe000f5babf206c
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_windirent.c 8f5fada630348558d5745b334702f301da1ffc61
  F src/test_windirent.h b12055cab6227f7be10f5c19296f67c60cc5e2a5
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
- F src/tokenize.c 3d338cdd00d916ce8a05c397001d64ed58e6fe1c
+ F src/tokenize.c 3b29883b0ce4a6c6f643965b66b5ca6613178e59
  F src/treeview.c e4b41a37530a191579d3c53142cc44ee2eb99373
  F src/trigger.c e14840ee0c3e549e758ec9bf3e4146e166002280
- F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
+ F src/update.c 3e67ab3c0814635f355fb1f8ab010a2b9e016e7d
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
- F src/util.c 8873d696c9ccc4206058c402e09e101f1b81561a
+ F src/util.c 187a0a2aaa3c5d2ccd2ab0143b2fd9e86d6bc816
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c 53884a06ae135f9ae0f3d3390e6675d4c51f2823
- F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
- F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
- 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/vdbe.c d3843a66d74a7696477ee5141e5eb9a7e5e2401c
++F src/vdbe.c 4c31c32772bcd87e075aa4f7d62b89095afaa73a
+ F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
+ F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 -F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
++F src/vdbeapi.c ded51c087af11b0d725720036ec12aea5140a6ee
+ F src/vdbeaux.c ace1875da40b7185e604586768d5ac90de7e4f7f
+ F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
+ F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
+ F src/vdbesort.c 0a8f98366ae794442e6d1ef71d9553226d885d19
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c 23b6cdfa996152d43b390504ed4a942c8caf3a00
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c c09752cafff70ccac871bd53dd7adc9b7331c919
 -F src/wal.c 4db22ed7e77bcf672b1a685d6ddeffba8d5be302
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
++F src/wal.c 5c7bde7a5f29c6321a66804210fd3b73aeb74aad
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c fe7925faafbe9a458972035c0bb4753d672f04ed
- F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
- F src/wherecode.c 863aedf086131743763c1960637fde904eadc442
- F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
+ F src/where.c bae50f2f18f9e8584549a77363858623b07e4915
+ F src/whereInt.h 7de94b751f088fe3fdc8cc04a491376f0900a059
+ F src/wherecode.c 8fdad9fbba723df1c1e8d07e7ea8507572040340
+ F src/whereexpr.c eacc0e60d029a082b4fc0cc42ea98544add1319e
 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -474,12 -492,12 +496,12 @@@ F test/async3.test d73a062002376d7edc1f
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
  F test/atof1.test ff0b0156fd705b67c506e1f2bfe9e26102bea9bd
 -F test/attach.test 437107943f14d131cf5efc2ae5305a94d7cb1d58
 +F test/attach.test 1e7275728d68631627ab3b81fa48d1fef22796ef
  F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
  F test/attach3.test 359eb65d00102cdfcef6fa4e81dc1648f8f80b27
 -F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 +F test/attach4.test faaaf33fa51f986b414520cb03cecdc7999df108
  F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
- F test/auth.test 855233ef26eb3601b6886567ea4e326c72959360
+ F test/auth.test 872a122b3977c1d1bb9fd637dc20016e5c01880f
  F test/auth2.test 264c6af53cad9aba5218c68bbe18036e39007bfa
  F test/auth3.test 5cfa94ed90c6617c42b7ba4b133fd79678b251c7
  F test/autoinc.test c58912526998a39e11f66b533e23cfabea7f25b7
@@@ -955,11 -972,11 +977,11 @@@ F test/pagerfault3.test 1003fcda009bf48
  F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0
  F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
  F test/parser1.test 222b5cbf3e2e659fec1bf7d723488c8b9c94f1d0
 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test af8067e4b6d684518956f8e2a744f42bde99014d
- F test/pragma.test 79a4a492ec23f80af576704fba20ae0333545eb4
+ F test/permutations.test cd1fa041074ed08eeaa563e4d1bacb0c69337ec1
 -F test/pragma.test dd5313eee9c6d9d4726593a68ede8768d3b50ccc
++F test/pragma.test 2e34da1ddf98d69b94ca6bee8b1241a393d2ced2
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 3f1984a04657331f838df5c519b443c2088df922
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
@@@ -1021,7 -1038,8 +1043,8 @@@ F test/selectE.test a8730ca330fcf40ace1
  F test/selectF.test 21c94e6438f76537b72532fa9fd4710cdd455fc3
  F test/selectG.test e8600e379589e85e9fefd2fe4d44a4cdd63f6982
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 -F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
+ F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
 +F test/shared.test 13376ba3be1c5685ab1ec184189adabd15fa70be
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
  F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
@@@ -1089,11 -1107,11 +1112,11 @@@ F test/tabfunc01.test f977868fa8bb7beb4
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test c6d9f546f79d15d0134c1e06583fb3ee0c3afad3
+ F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa
 -F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempdb.test be87085066978807bb9eb934ae3986521e88a675
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 4b09369e559630d71cff6a1d7b7099a00e447f95
 -F test/tester.tcl 7b740ee852c55e1e72b6ebe5044acee7aa4e5553
++F test/tester.tcl 4dd35afb8626386a8fef563388d6bb984f831557
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1407,8 -1425,8 +1430,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
- F tool/mksqlite3c.tcl 823225909045c7735e9857c408a7ac2bbfb87fbd
- F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
 -F tool/mksqlite3c.tcl 63af8429841f08552e6da1d93b3dee4a93ff8071
++F tool/mksqlite3c.tcl bfafc3e96885a2afa8b0d733826ee89e2db3d8b3
+ F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1464,7 -1482,8 +1487,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 063f1b3705625b2f115af8e909d86705b892b529 e9bb4cf40f4971974a74468ef922bdee481c988b
- R e27a7e6077194133d8bd669ef8c3c94c
 -P 3340f086510b08ce5b42a8781f1df51bf7c27701 debafa5efd37ac60e030d0963ce8e7c4f51a0f10
 -R dbbe3c46925f0d8701c8262054bfff8c
 -T +closed debafa5efd37ac60e030d0963ce8e7c4f51a0f10
++P eef557449cf665aa8deb85674b7db167b389776a c4f165c460c4244ed434107feac005efa3c386cf
++R 2a8e53c1ce65650abbcbbce9eb4700f6
  U drh
- Z 4f7987322815e5acc3a71c7184765993
 -Z 9611378dd74ba12ce4b14951f611f1d2
++Z b82cbfae826a457efa45f868b4061952

diff --cc manifest.uuid
index 667f56f03b770e7ff4a8cad4970330660dc0486e,cda7b3c0ff37cf495c366a019118ac176458dec9..223cde8f661a1c68a38dbeecdd6d589126cd3a1f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- eef557449cf665aa8deb85674b7db167b389776a
 -c4f165c460c4244ed434107feac005efa3c386cf
++a15c49aed09a6f431022bc73aa98b04165649192

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
index 81b73c47290db71114aadc1a5269de458afb6bce,20158080898da3e75ef6edd6aeda44c742b7dfe4..063af5aa6dbef4c3985963d9d997f5e852855912
--- 1/src/pager.c
--- 2/src/pager.c
+++ b/src/pager.c
@@@ -7353,13 -7311,7 +7353,14 @@@ int sqlite3PagerCloseWal(Pager *pPager)
                             pPager->pageSize, (u8*)pPager->pTmpSpace);
        pPager->pWal = 0;
        pagerFixMaplimit(pPager);
 +
 +      /* Ensure that the WAL file is deleted even if the PERSIST_WAL
 +      ** hint is enabled. */
 +      if( rc==SQLITE_OK ){
 +        rc = sqlite3OsDelete(pPager->pVfs, pPager->zWal, 0);
 +        if( rc==SQLITE_IOERR_DELETE_NOENT ) rc = SQLITE_OK;
 +      }
+       if( rc && !pPager->exclusiveMode ) pagerUnlockDb(pPager, SHARED_LOCK);
      }
    }
    return rc;

diff --cc src/pager.h
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
index 191405a7a422ff8f671a0f3b97e07b7f64f6051e,7e8558d2ab197669aea1982fc534c2f2d7cb7cb2..b471b5d1e635a80e5277d0efec2e8f11c5f57451
--- 1/tool/mksqlite3c.tcl
--- 2/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -377,9 -379,9 +380,10 @@@ foreach file 
     rtree.c
     icu.c
     fts3_icu.c
 +   sqlrr.c
     sqlite3rbu.c
     dbstat.c
+    sqlite3session.c
     json1.c
     fts5.c
  } {