Merge changes from trunk.

FossilOrigin-Name: 0f707d1532d6c8277cf0f70821a83e0af621ce9b

diff --cc Makefile.in
Simple merge

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

diff --cc main.mk
Simple merge

diff --cc manifest
index 951250341f4e8a3318e08dcd0d5019ae0c0699bc,4f19e2712afe21e0494cee28008ab8b32f64bd0d..252fded560f7714018a8596f362113b60bcb4199
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
 -C Fix\sRBU\sso\sthat\sit\sbuilds\swith\s-DSQLITE_ENABLE_8_3_NAMES.\nFix\s"PRAGMA\scompile_options"\sfor\sSQLITE_ENABLE_8_3_NAMES\ssuch\sthat\sit\sreports\nthe\snumeric\ssetting:\s"1"\sor\s"2".
 -D 2016-06-13T19:58:46.382
 -F Makefile.in f3f7d2060ce03af4584e711ef3a626ef0b1d6340
 +C Merge\schanges\sfrom\strunk.
- D 2016-05-23T02:57:33.498
- F Makefile.in 1c34d0f6435372ae8f1ef3d4b1832ae31bb20ad3
++D 2016-06-15T10:21:06.192
++F Makefile.in 0d33a6d04cdfd1c037647ad1790a3eebe35a883c
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
+ F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -253,11 -256,11 +256,11 @@@ F ext/rbu/sqlite3rbu.c 3d35b1dc46f5ca0f
  F ext/rbu/sqlite3rbu.h 2acd0a6344a6079de15c8dc9d84d3df83a665930
  F ext/rbu/test_rbu.c 9bbdf6bd8efd58fbc4f192698df50569598fbb9e
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 428878f7b016639149f6c95cef5741f835554765
 -F ext/rtree/rtree.c d26a815b0df1c412a6881dae8d7fd3c9c08cce68
++F ext/rtree/rtree.c 45c6bec21cfe7579c5b81f2f236bd929b839694c
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test 96a80c08440c932cd72aac50660e7af2612d2cda
+ F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
- F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
+ F ext/rtree/rtree3.test 2cafe8265d1ff28f206fce88d114f208349df482
  F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
  F ext/rtree/rtree5.test 6a510494f12454bf57ef28f45bc7764ea279431e
  F ext/rtree/rtree6.test 773a90db2dce6a8353dd0d5b64bca69b29761196
@@@ -306,7 -307,7 +310,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 1ca9d89a40694289c21c1292cee09cfd3d1f88d0
 -F main.mk 3f669c06db5c4a53ff21dda639247c6310497180
++F main.mk 9fd80b4a8d315ce51bf25cfe729958312f1bf0dd
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -325,28 -326,28 +329,28 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 3a0ee76b57ce83b41d83df964a64ea411133ce05
- F src/btree.h 1342a9b2cc2089e3534d3ef00204786783f6aea6
 -F src/btree.c 0621247619df15790f7ed5f14926cfb3925c10b1
++F src/btree.c 765b38f6127c43a8a1872f932d37b2478572ba60
+ F src/btree.h 2107a2630e02c8cba58bb12ce14e731e734ea29c
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
- F src/build.c 785fa789319d93c6ae20efbd01d4da9ce8f8a793
+ F src/build.c d1fdfd7ab8f5447e494ef15825973bf0719527c6
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
+ F src/ctime.c 61949e83c4c36e37195a8398ebc752780b534d95
  F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
- F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b
+ F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
  F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
- F src/expr.c 8796c0739b2ad091e6779253f62aad6e767e2be1
+ F src/expr.c 798146ea4c87d723e8a157d88450ac9c43256998
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 4c0bd09e602b8ae8d36d81e31e4872d0b53c87bb
- F src/func.c ef4c18c8a66143413ce41a58d582d2c14ddf78e1
+ F src/fkey.c bc4145347595b7770f9a598cff1c848302cf5413
+ F src/func.c 61a4114cf7004f10c542cfabbab9f2bcb9033045
  F src/global.c c45ea22aff29334f6a9ec549235ac3357c970015
  F src/hash.c 55b5fb474100cee0b901edaf203e26c970940f36
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
- F src/loadext.c 8b3a73f0624c5f7cadbd5cb89940783bee1d39a6
+ F src/loadext.c 4237fd37ca589f1d90b3ea925dd9df20da8e0c84
 -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
@@@ -365,39 -366,38 +369,39 @@@ F src/os.c bb97ef31f4674b0bb57d13a98183
  F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343
  F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 -F src/os_win.c d4b8faf8896b65818e67070711fdd00d8e620bd6
 +F src/os_unix.c defa2c6c6e01219459fa783d2f55841271c4eebc
- F src/os_win.c b717a28c34e158dbd392b57ead178903e17968ce
++F src/os_win.c c5651f7c0eef2b267cad643197cbad77811e4108
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60
 -F src/pager.h 8ab6b6feeee4bc0439bfde7ee59ba99df98b9bc3
 +F src/pager.c db9dccd139b20213507392831341ad64505c4106
 +F src/pager.h 156c60a0575fbae0e3bf3c30ccc9542d5cc4cfad
- F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
+ F src/parse.y 01b9f37c4c7009ab56fda98bc7db4c42643cecfe
  F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
 -F src/pragma.c c8b499756658cb8b82cfdbb5845c22cf11f297aa
 +F src/pcache1.c 9c2f433344e345da87f944c66e54b9e3e5d49693
- F src/pragma.c 11046a2eb7beca8572b038b473c2b15a3e5a8868
++F src/pragma.c 1564ee0bc96aed8b39cfec2c5bb655e031b6431c
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
 -F src/prepare.c 22df6171aec1d86904ed2ad30c2348a5748aa04e
 +F src/prepare.c 9c56ea254317e27d3a1273fa812b8578b5e2f850
  F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c a0c4abf54bc6bd3a9c77a36ef3d1676045706cb2
+ F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
  F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
- F src/sqlite.h.in 42b0c884153a175d4e5a1a45b5e404ea35379b06
 -F src/sqlite.h.in 5f8113dbec74c6c093ead9930afb8c9fbd9f643d
++F src/sqlite.h.in 171a61d64618d49f70eeacc85234c874f7857945
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2
- F src/sqliteInt.h ece2cdeacd233e413da3978c515404531b089436
 -F src/sqliteInt.h b425bb606c14c078b1c9feb7cf72f2f3a35be188
++F src/sqliteInt.h 87671d1b47bbc1a97a7a55eb1bd66f8972795b3c
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
- F src/tclsqlite.c 9c4c4589d078de37813ded708d8838b338ffb060
- F src/test1.c 59591879bed010df4b08f500f11318f2b5539784
+ F src/tclsqlite.c 25fbbbb97f76dbfd113153fb63f52d7ecfac5dd0
 -F src/test1.c 43b37ab2b7338fd3313e74902f0d6c821eae843b
++F src/test1.c 95dc5c2e299b721b250078e0382d9ab49219a144
  F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
- F src/test3.c d2c9efd2985ff8f5502ffd3253156984778d77d8
+ F src/test3.c c75c8af0eadb335236c9e61b51044c58a8f7dd59
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
- F src/test6.c 2c014d4977efd6107ec9eef3dfdec56ac516f824
+ F src/test6.c a684b7abd01352ab50cb79c0bf727e6b3f381a3d
  F src/test7.c 9c89a4f1ed6bb13af0ed805b8d782bd83fcd57e3
  F src/test8.c fa262391d3edea6490a71bfaa8fed477ccbbac75
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
@@@ -448,25 -448,25 +452,25 @@@ F src/update.c 4f05ea8cddfa367d045e0358
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
  F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
- F src/vdbe.c b7ab09530115c2d82bf108b8fc92e5205e70ad75
 -F src/vdbe.c e23a15d352e63b51cf08af8052e678e67c54ec09
++F src/vdbe.c ed5269047a99b3c7d1210ce8b5a88a997d37f57e
  F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
  F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
- F src/vdbeapi.c ded51c087af11b0d725720036ec12aea5140a6ee
- F src/vdbeaux.c 1d6b9a979d1036db7bc39990e9e683f19520bc5c
- F src/vdbeblob.c c9f2f494b911c6fa34efd9803f0a10807da80f77
- F src/vdbemem.c 5cfef60e60e19cab6275d1b975bf4c791d575beb
 -F src/vdbeapi.c 02bcbc2ca5d2004b029088b05b468b394881e103
++F src/vdbeapi.c ac62868e4d63d470e287fc9460a4d4fe5ff74fad
+ F src/vdbeaux.c c90275b0e55a2b32c03dc09314194fe46f2429d8
+ F src/vdbeblob.c 83d2d266383157b02e2b809350bb197e89d7895b
+ F src/vdbemem.c 1ecaa5ee0caff07255f25d04e8dc88befb6f88d1
  F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
  F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
- F src/vtab.c ce0f2ebb589b459b32c640b33af64bfa5b29aaf8
+ F src/vtab.c 948d2d4984219eee37a7bf427d6667e21e6eb92e
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c 5c7bde7a5f29c6321a66804210fd3b73aeb74aad
 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 -F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
++F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9
 +F src/wal.h 29c2a284ddd9c665199273dadc7255a227092291
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 0e54a03d11d4e99ad25528f42ff4c9a6fa7a23da
- F src/whereInt.h 6e18240be400bef8e4dbafea605251707c5dbf49
- F src/wherecode.c e3f18fcda2d7f8218a09dc33cf495dca0efa6e3e
- F src/whereexpr.c eacc0e60d029a082b4fc0cc42ea98544add1319e
+ F src/where.c 74f0798525b6306682d7234f230ea93f86959b9b
+ F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
+ F src/wherecode.c ba71a4e4bada29aa9842200e6299714bf18c812c
+ F src/whereexpr.c c32d47085dbaca0b8fd013210f56693c7d220d48
 -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
@@@ -613,7 -614,8 +618,8 @@@ F test/crashM.test d95f59046fa749b0d082
  F test/crashtest1.c 09c1c7d728ccf4feb9e481671e29dda5669bbcc2
  F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
  F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
- F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
+ F test/csv01.test 0929a9ce47021519512be92861f29e32d2538e5f
 -F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
++F test/ctime.test 8b88c335b2018d4cc803b093e07e4a183d67ceec
  F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
  F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65
  F test/dbstatus.test 8de104bb5606f19537d23cd553b41349b5ab1204
@@@ -1099,9 -1100,9 +1105,9 @@@ F test/spellfix3.test 0f9efaaa502a0e0a0
  F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e
  F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
  F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
- F test/stat.test 66e95f97b9f724f9ab921d054ee0db3c2689f1ee
+ F test/stat.test ab95d28503d0f6d98ffd8ce204643c9da090ebf1
  F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
 -F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
 +F test/stmt.test fc832e52bd1273144abbb27c07fc01d1acdd9939
  F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1116,8 -1117,8 +1122,8 @@@ F test/tabfunc01.test f977868fa8bb7beb4
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
- F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa
+ F test/tclsqlite.test cf0d0a3fd03d64892cec2d48aae9fb2f148680a5
 -F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 +F test/tempdb.test be87085066978807bb9eb934ae3986521e88a675
  F test/tempdb2.test 4fc92055f2a3f7626c0f2eabbb637dc021b311d5
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
@@@ -1342,35 -1343,36 +1348,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 a9d6aa635b9d63607dabdc11406f5f96ca986635
 +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/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 3374d6a0813bfe9d841a973958e0552b545a6423
 -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 059cb75484a1ecf6357a2c1b3324b8156749221e
 -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 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1497,7 -1501,7 +1506,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 e2e9b98556f45ed2d6fb34db67957539932bd2c5 90411a28168f6dacf08242a25bed7d6269041417
- R 261dc84152f8f4a8797ded2bd7c4a902
 -P a1e1cdc51d1c68502f43ac72c28ba87cb1916a0d
 -R c278a2e099b6be15733b154091fd5a26
++P 815cc2bb48db713a0166b82a55ae931ac43783d1 0230ca17ba20ecd3d213788ad6891973d52a7b72
++R fd85b1aa025da2f637c342d358ad22e0
  U drh
- Z d1fa9f8fcb62d1bd3b65913dd760b63b
 -Z 0e8cfd82e8662e22b8b1a31845a5f102
++Z a8f3adf4cc6a98b1388974156651432f

diff --cc manifest.uuid
index ad4283571bbc194ae199adae8399681e8c89e8f5,731f5db73fdc2b6a164629916ff84244f5ecf22f..79b8d2e9b3194fa1c64477d70e9e945c51c59de2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 815cc2bb48db713a0166b82a55ae931ac43783d1
 -0230ca17ba20ecd3d213788ad6891973d52a7b72
++0f707d1532d6c8277cf0f70821a83e0af621ce9b

diff --cc src/btree.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/pragma.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/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/wal.c
index 91ab9b972d8bba42d121a4e24aa4ebe12cea0733,235d383e1ae58658c785fcb801e33cc8848d2814..f054e9e73b810a64a1388fb6acfc9f84a35d7e37
--- 1/src/wal.c
--- 2/src/wal.c
+++ b/src/wal.c
@@@ -3147,14 -3113,11 +3148,16 @@@ int sqlite3WalFrames
      if( pWal->padToSectorBoundary ){
        int sectorSize = sqlite3SectorSize(pWal->pWalFd);
        w.iSyncPoint = ((iOffset+sectorSize-1)/sectorSize)*sectorSize;
+       bSync = (w.iSyncPoint==iOffset);
+       testcase( bSync );
        while( iOffset<w.iSyncPoint ){
          rc = walWriteOneFrame(&w, pLast, nTruncate, iOffset);
 -        if( rc ) return rc;
 +        if( rc ) {
 +#if defined(SQLITE_WRITE_WALFRAME_PREBUFFERED)
 +          free(w.aFrameBuf);
 +#endif
 +          return rc;
 +        }
          iOffset += szFrame;
          nExtra++;
        }

diff --cc test/ctime.test
index e4cb156168be57f9208e8bba8f247cbd740dac6d,e4cb156168be57f9208e8bba8f247cbd740dac6d..17cc024a91c7ed6828a29aa79eb1412615fa9305
--- 1/test/ctime.test
--- 2/test/ctime.test
+++ b/test/ctime.test
@@@ -202,7 -202,7 +202,7 @@@ foreach opt $opts 
      set ans2 [ catchsql {
        SELECT sqlite_compileoption_used($opt);
      } ]
--    list [ lindex $ans1 0 ] [ expr { [lindex $ans1 1]==$opt } ] \
++    list [ lindex $ans1 0 ] [ expr { [lindex [lindex $ans1 1] 0]==$opt } ] \
           [ expr { $ans2 } ]
    } {0 1 {0 1}}
    incr tc 1