Merge updates for version 3.15.1.

FossilOrigin-Name: 0e5ffd9123d6d2d2b8f3701e8a73cc98a3a7ff5f

diff --cc Makefile.msc
Simple merge

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc manifest
index 021f4fa3d4253bbc95cc4b761cddef24b816858b,daade9e2e42301619b252abb3ceb4d0153b65233..955adcec982eb3b192eccb8b9e6c09bba2baa588
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\srecent\senhancements\sfrom\strunk.
- D 2016-09-28T16:15:20.091
 -C Avoid\sa\scrash\sthat\scan\soccur\safter\san\sobscure\sOOM\sin\sthe\sbuilt-in\sINSTR()\nfunction.
 -D 2016-11-04T12:05:29.977
 -F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
++C Merge\supdates\sfor\sversion\s3.15.1.
++D 2016-11-04T19:09:39.851
 +F Makefile.in c9c70541089a9755069a9dad0b609cf14a382649
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 0793c4def0e01467219ba93abfaf92086c691c4b
 -F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
++F Makefile.msc a8af814f63c124db048517b63a0b8650c3fc26fc
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 25e2e333adeff5965520bc8db999c658898c972d
+ F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -259,7 -260,7 +260,7 @@@ F ext/rbu/sqlite3rbu.c e074c38798b90591
  F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
  F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c cd7e3d8f0ecc3d8797cde380947fc18821741853
 -F ext/rtree/rtree.c 078fc27417b48aaebe988621bf96ef0e1645b201
++F ext/rtree/rtree.c 0f08a7e36539acfac8a374d1daa23ba62e1242b6
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -329,16 -327,16 +330,16 @@@ F src/alter.c 299117695b1f21ac62dfc5b60
  F src/analyze.c 8b62b2cf4da85451534ac0af82cafc418d837f68
  F src/attach.c 8c19066b4b5357b5d66154e856c61df01e71203a
  F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
- F src/backup.c 92c2e3b5fcb47626413717138617f4d32f08aea4
+ F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 39e9ee325135c6ecfdea044286050d5c6ca2751e
 -F src/btree.c 6ae1c17347fb2888b2b28a260b947b7717a9fca9
++F src/btree.c 67d1cc4ed947287c57a6e8a00af0b32672d1d10e
  F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 9a1f228cfa0aec70e2b4eba1fcf141ca4b499f6e
+ F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
+ F src/ctime.c a2a52d6e353f459d8ab0f07321f60fafa47d5421
  F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
  F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec
@@@ -351,11 -349,11 +352,11 @@@ F src/hash.c 63d0ee752a3b92d4695b2b1f52
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 427e96ff168b6b187a52c3d06b9f9e41f6ffb212
+ F src/insert.c 2d5e197f2f60351937b201196965fd14cd88489c
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
- F src/main.c 406b69b61b3eaa5b0271542513e46b5a929afbb3
- F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
 -F src/main.c 694ac90557abdaa62151a6090670e107b0f2c2ab
++F src/main.c a393b7bf99214729f8343ab2abd2ea78d776e6f1
+ F src/malloc.c 5ee7c2d3dcb1b0a902c9c6d0115deef54736bdfa
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -373,35 -371,34 +374,35 @@@ F src/os.c c03b50496df5815e8f6d45bae440
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 -F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
 -F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 +F src/os_unix.c 5f558f9433256f25d2f2dd852c7e93a84c05e1e4
- F src/os_win.c 8ba3403e276b0b01fd822bfcc162b83cacc80a1a
++F src/os_win.c 4224bff1904dfdf3664680897e1b5077de1fd649
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 06b9b230273dbbd700a6f2bfe39d51be4bb0da03
- F src/pager.h 16644d79a66502f77389648ad5f2dca0ce0095de
- F src/parse.y 6ad22b8f4a673de775d68c5c306dddd15839c45f
- F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
 -F src/pager.c 549ed86833b484fa3cd4799e3289c83b3ace8859
 -F src/pager.h 07d6938df0b74e4abe8f57807a8b0e1084321d8b
++F src/pager.c 3fea5fb3694c36870dc18730f914a52ed838b507
++F src/pager.h a409efecb53b5bc380e7da848d6de6a2e4958d8e
+ F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664
+ F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
- F src/pcache1.c 42fc9916238609e499c04e521138cecd42a20b90
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44
++F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
 +F src/pragma.c 7a32fcc81f3c765621dba31a248dfbeb0342b569
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
- F src/prepare.c 9d96dd74aabcae932604807f178ccb5c420e160e
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
++F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3c3cf0dc719cd2a32ab5c1e10c26481dd565492e
+ F src/resolve.c 3fac1b2737ea5a724f20b921ac7e259c9be2100b
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 6dede310d202f7a0da7f4ac1921f153707fa3d4f
- F src/shell.c b80396d2fadce4681397707e30078bf416e1dec2
- F src/sqlite.h.in b5a94ea112d93188c97469c28f5b7a6291274c52
+ F src/select.c ea3af83e2d0f245fef81ea4cf04cb730ce67f722
+ F src/shell.c 63e54cfa1c7ec5b70a4c9a86502bc10280c3d5a3
 -F src/sqlite.h.in 97e9b0f952306677db82b055147ed1d99cb7ba66
++F src/sqlite.h.in 8078d183ab1bbe1263365fbc1bcd2f31fc46a6ef
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
- F src/sqliteInt.h 0b39c63b51d0cb9a6ebce3d1af37a1c4b9005e42
 -F src/sqliteInt.h 37628fe30c464dc790bcee3bfd3d0caa8f222ed1
++F src/sqliteInt.h d8f69b332b83e8e822678ed7f845b20fdfbe5687
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
  F src/tclsqlite.c aef87dcd8cb66564d560ab48d43d19ac812a1eab
- F src/test1.c 0463a5089398da31afa8520a6774f8d4ebdbcff3
- F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
 -F src/test1.c f52bed152c97be23be794efa234374d0de593eeb
++F src/test1.c fce5f13ac4d0273be80f926fce71d78663af3b2b
+ F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c d03f5b5da9a2410b7a91c64b0d3306ed28ab6fee
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
  F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
@@@ -415,7 -412,7 +416,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9
  F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96
  F src/test_blob.c a0f7ad49a0c9d4b72f693fe2a71c58d7e507174d
  F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
- F src/test_config.c e91bd1471a56cf0267fd934f13e916b788e5f7af
 -F src/test_config.c 371853b4691b482ec0bcdf77ec9e3f96dca75b04
++F src/test_config.c c56fe0fc7bc903232931c932381dc69b020445d8
  F src/test_delete.c 32690ea215abf29dda589a580cd1b790389759b6
  F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
  F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
@@@ -456,26 -453,26 +457,26 @@@ F src/trigger.c 3419bb9862983d84d70735f
  F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498
- F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3
- F src/vdbe.c 5860e52c8103bc42f5fcd97dbfa72cc4c1806edc
+ F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
 -F src/vdbe.c 2edc4fa8a825c79a929766f50bc800ea158646d2
++F src/vdbe.c 682df0100020f6dbf8127e3ae6a28c53efaeafb5
  F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
- F src/vdbeInt.h d21f14721dd87975dc9e3bcdbf504f9c098cf611
- F src/vdbeapi.c 7c42a9682cafe2835197763ff5f26c3e546d053e
- F src/vdbeaux.c b9772e4134a17f5b42d32761f5119467815c2458
+ F src/vdbeInt.h d8a56a491b752dbb5f671963b8c861ec72ea875e
 -F src/vdbeapi.c 97129bec6b1553da50d8e73f523c278bda66d9f6
++F src/vdbeapi.c 4ecb0af9414e50c36dcb5a245191a7964b8b74cc
+ F src/vdbeaux.c 52d9b840859f260ce8418be9333dd77c902e1c74
  F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937
- F src/vdbemem.c 07874c2ac7c05f7df1ededc6ec6650c1339b2cad
+ F src/vdbemem.c fcdd73a2001a673f48a244a77b1038928ae729c9
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9
- F src/wal.h f38853cd771ff42f448de4f908238f2e2966ac8f
 -F src/wal.c 358ab4d296a12bc9dcb6f8974dd155ba8a9b10c4
 -F src/wal.h bf03a23da3100ab25e5c0363450233cfee09cfc2
++F src/wal.c b782fa386a4f7b5a8c974f481d8bc004464849a2
++F src/wal.h 8fed212c25dc0b33abb9c287ccd8e242796a73e8
  F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
- F src/where.c 5f91be9fe122e847c4e72d54d3989eb32a927981
- F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
- F src/wherecode.c e412e09abad1eea213d85594cf46db9f877db56d
- F src/whereexpr.c 3d8813ef320f10bd27e6c0d784abe1669cfb514e
+ F src/where.c 952f76e7a03727480b274b66ca6641b1657cd591
+ F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
+ F src/wherecode.c 717a65294df46f30e9b9933d2a63a4bcbca5a9a8
+ F src/whereexpr.c a83d70154f3bbce5051a7e9710021f647c0fe4f2
 -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
@@@ -625,12 -622,12 +626,12 @@@ F test/crashtest1.c 09c1c7d728ccf4feb9e
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
  F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
- F test/ctime.test 4b4a66a12d0fd959fa295e56067bc21843583f88
 -F test/ctime.test ff6c38e822459d6ca743c34901caf57740b08b54
++F test/ctime.test a4effbe5472ef6c0308c4ebcba55c802aa297fff
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
- F test/cursorhint2.test 2b45341d32d1aae9991a00ef31ebca339b274255
+ F test/cursorhint2.test fa41f0d997e67db921d08c31e73111b32811201a
  F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
  F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 -F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 +F test/dbstatus2.test 16194c6aa2d8a050f227890d2ed1eb5f8dcb8300
  F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
  F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5
  F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
@@@ -682,8 -679,8 +683,8 @@@ F test/exists.test 79a75323c78f02bbe9c2
  F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93
  F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9
  F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85
- F test/filectrl.test 7c13f96457435238da99aff7343ad6a3a4885787
+ F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
  F test/filefmt.test e4edbdc637ca9576ccf4337a3cce627d9df7a56c
  F test/fkey1.test 13e3d48236a2b9f5c5ebd232eef9b3ab682a8a2c
  F test/fkey2.test f3d27ecba480a348c328965d154214719bb158a9
@@@ -838,8 -835,8 +839,8 @@@ F test/in4.test d2b38cba404bc4320f4fe1b
  F test/in5.test 6c006e0bcd7351b69350ef566e65f244023489e9
  F test/incrblob.test c9b96afc292aeff43d6687bcb09b0280aa599822
  F test/incrblob2.test a5ce5ed1d0b01e2ed347245a21170372528af0a5
 -F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
 +F test/incrblob3.test 5fa6f2665ae37da05928bb16851d4f86515af78a
- F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
+ F test/incrblob4.test fab83541571c7281aa561e5ea6088eb8612a4bec
  F test/incrblob_err.test 69f9247fed50278d48ea710d1a8f9cdb09e4c0b8
  F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
  F test/incrcorrupt.test 6c567fbf870aa9e91866fe52ce6f200cd548939a
@@@ -958,7 -956,7 +961,7 @@@ F test/mmap2.test 9d6dd9ddb4ad2379f29cc
  F test/mmap3.test b3c297e78e6a8520aafcc1a8f140535594c9086e
  F test/mmap4.test 2e2b4e32555b58da15176e6fe750f17c9dcf7f93
  F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3
- F test/multiplex.test 2ed4db53c3304b7eb7b8744206ee9271799a32eb
 -F test/multiplex.test dc0d67b66f84b484a83cb8bbdf3f0a7f49562ccd
++F test/multiplex.test 659fdd41065d4af3fc769b87052c275d0c4685fb
  F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a
  F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101
  F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4
@@@ -1025,10 -1024,10 +1029,10 @@@ F test/resolver01.test f4022acafda7f4d4
  F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
  F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
  F test/rollbackfault.test 0e646aeab8840c399cfbfa43daab46fd609cf04a
 -F test/rowallock.test 3f88ec6819489d0b2341c7a7528ae17c053ab7cc
 +F test/rowallock.test e8c576ebc92f6b9211662f495658fd39bbcacb5b
  F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
  F test/rowid.test 5b7509f384f4f6fae1af3c8c104c8ca299fea18d
- F test/rowvalue.test 753eb744b7efeb5ac643d35d6e1e5066452ccf79
+ F test/rowvalue.test bcd78c91fe2aadade6fd00d2616546650b9ebc9e
  F test/rowvalue2.test 060d238b7e5639a7c5630cb5e63e311b44efef2b
  F test/rowvalue3.test 01399b7bf150b0d41abce76c18072da777c2500c
  F test/rowvalue4.test 4b556d7de161a0dd8cff095c336e913986398bea
@@@ -1371,36 -1371,36 +1376,36 @@@ F test/vtabI.test 751b07636700dbdea328e
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
 -F test/wal.test 613efec03e517e1775d86b993a54877d2e29a477
 -F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
 -F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
 -F test/wal6.test b602704e4b066199bc89d91ca9000f335dcf4572
 +F test/wal.test 83635d428b0a3fe883939cedbaedf29e13a5affd
 +F test/wal2.test 72286d113a40817702fa59285ee5b82effbfe754
 +F test/wal3.test 82f70ca79e5db6829f9246f4a30d4a4751921c3b
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 9304fada875d7279deb2783385b0ae1c02d96b88
- F test/wal6.test 557fab4cc02b4ce2adf1d0f8821cb8acdaa1304f
++F test/wal6.test 3d9b79194d15f5b4f6e4169f89f815c049edb2df
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test 82bf6e493002b2d1580823b40e47bce3e15f468a
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test 018d4e5a3d45c6298d11b99f09a8ef6876527946
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test e322af729156c121183af4847c6e2b17bc629f47
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
  F test/walblock.test be48f3a75eff0b4456209f26b3ce186c2015497d
 -F test/walcksum.test bb234a1bb42248b3515d992b719708015c384278
 -F test/walcrash.test 21038858cc552077b0522f50b0fa87e38139306a
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 +F test/walcksum.test add42a54d7c7d9bc72a913792022a195293bef2b
 +F test/walcrash.test 065a041da88f980df3830f09b7fe308337bb594a
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
  F test/walcrash4.test e7b6e7639a950a0cca8e210e248c8dad4d63bf20
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
  F test/waloverwrite.test dad2f26567f1b45174e54fbf9a8dc1cb876a7f03
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
  F test/walprotocol.test 0b92feb132ccebd855494d917d3f6c2d717ace20
 -F test/walro.test 4ab7ac01b77c2f894235c699d59e3e3c7f15a160
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/walro.test 310f5f364e64eaaa2f2233229a7b602ccb038bc9
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 07a51cbe9d4895d0a90c7af76d14a62d363ac162
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test f0c325563acde44f2c4ea6ba348e9e29f7121757
  F test/where2.test 478d2170637b9211f593120648858593bf2445a1
  F test/where3.test 54cdeb02157acc979de41530b804ae7b09552bf1
@@@ -1471,10 -1471,10 +1476,10 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
 +F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66
  F tool/mksqlite3h.tcl c006c4e5da57c649b24b689511dcd270dd7b0249
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
- F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7
+ F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97
  F tool/opcodesum.tcl 740ed206ba8c5040018988129abbf3089a0ccf4a
@@@ -1530,7 -1530,7 +1535,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 e3d9efa2770cd789ece3f4db4941b901c8b805ad 40c0fb0af678797c39a99853f9f4102464c16f4b
- R 89bdba00312d25d8261efa344ac63fa8
 -P afbbb6c66a85ff3f4c8dce677e0892a2a51d2b8e
 -R 54226d0f905e5410be62ada12fc4c3f1
 -U dan
 -Z 547f4b4fa61cca40324639e3127db72b
++P 06014163475051b7f3b3570e8af434362bbc5b87 b86b79c442a58d10aa005ba4f34095375a88d242
++R bcb3efeba01d0af0aee999d16c1330b7
 +U drh
- Z ace1466a283f1236a2a6574723ddf758
++Z 6f3c15f758e9fbdf4e4bd5482bd7aa1f

diff --cc manifest.uuid
index 4b2f54732057c79c687617a65863c37beb7bab06,e7888e69700d0790ed7aad53bb04ce140a03e84a..9c42a717630bc3bac7a8a687260f90e0c158fdb5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 06014163475051b7f3b3570e8af434362bbc5b87
 -b86b79c442a58d10aa005ba4f34095375a88d242
++0e5ffd9123d6d2d2b8f3701e8a73cc98a3a7ff5f

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/pager.h
Simple merge

diff --cc src/pcache1.c
Simple merge

diff --cc src/prepare.c
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
index b8d1c9479a16f5483bc0128016554f211ac83a7d,d8e6b3c0fa1f16b790fce5229a215253b9c70f74..012cc9b573a4405cd30b2d116ccf7568a628f1c1
--- 1/src/test_config.c
--- 2/src/test_config.c
+++ b/src/test_config.c
@@@ -728,22 -714,12 +728,28 @@@ Tcl_SetVar2(interp, "sqlite_options", "
    Tcl_SetVar2(interp, "sqlite_options", "sqllog", "0", TCL_GLOBAL_ONLY);
  #endif
  
 +#ifdef __APPLE__
 +# if  defined(__ppc__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "ppc", TCL_GLOBAL_ONLY);
 +# elif defined(__i386__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "i386", TCL_GLOBAL_ONLY);
 +# elif defined(__x86_64__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "x86_64", TCL_GLOBAL_ONLY);
 +# elif defined(__arm__)
 +  Tcl_SetVar2(interp, "os_options", "arch", "arm", TCL_GLOBAL_ONLY);
 +# else
 +#  error Unrecognized architecture for exec_options
 +# endif
 +#else
 +  Tcl_SetVar2(interp, "os_options", "arch", "unknown", TCL_GLOBAL_ONLY);
 +#endif
 +
+ #ifdef SQLITE_ENABLE_URI_00_ERROR
+   Tcl_SetVar2(interp, "sqlite_options", "uri_00_error", "1", TCL_GLOBAL_ONLY);
+ #else
+   Tcl_SetVar2(interp, "sqlite_options", "uri_00_error", "0", TCL_GLOBAL_ONLY);
+ #endif
+ 
  #define LINKVAR(x) { \
      static const int cv_ ## x = SQLITE_ ## x; \
      Tcl_LinkVar(interp, "SQLITE_" #x, (char *)&(cv_ ## x), \

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc src/wal.h
index a55362804b2b5e2bd5a8a93e9d9670780271d5c6,16d9d6e0d466760e761d60419d6cb3c8c6ea496b..982f0367092c412e97259cab42847158534eecd0
--- 1/src/wal.h
--- 2/src/wal.h
+++ b/src/wal.h
@@@ -55,8 -55,8 +55,8 @@@
  typedef struct Wal Wal;
  
  /* Open and close a connection to a write-ahead log. */
 -int sqlite3WalOpen(sqlite3_vfs*, sqlite3_file*, const char *, int, i64, Wal**);
 +int sqlite3WalOpen(sqlite3_vfs*, sqlite3_file*, const char *, int, i64, int, Wal**);
- int sqlite3WalClose(Wal *pWal, int sync_flags, int, u8 *);
+ int sqlite3WalClose(Wal *pWal, sqlite3*, int sync_flags, int, u8 *);
  
  /* Set the limiting size of a WAL file. */
  void sqlite3WalLimit(Wal*, i64);

diff --cc test/ctime.test
Simple merge

diff --cc test/multiplex.test
Simple merge

diff --cc test/wal6.test
Simple merge