Merge all recent trunk enhancements into the apple-osx branch.

FossilOrigin-Name: 44711921fea2bb2d804d57b23872ab84156a04ba

diff --cc Makefile.in
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 3e887f98cf48e87d64bfd66ebf4f1974ddb3359a,b31e5b645478ff7fa85fd8220fc5b9c551f56cbb..75403b44d440d1a44a5c4cfe5b03466d8b8f56dd
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\s3.8.8\srelease\schanges\sfrom\strunk.
- D 2015-01-16T12:24:00.930
 -C Change\sthe\sname\sof\s".info"\sto\s".dbinfo"\sand\sadd\san\soptional\ssecond\sargument\nwhich\sis\sthe\sATTACH-ed\sDB\sabout\swhich\sinformation\sis\sprovided.\s\sProvide\n".indexes"\sas\san\salternative\sname\sto\sthe\slegacy\s".indices"\scommand.
 -D 2015-02-06T14:51:13.355
++C Merge\sall\srecent\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
++D 2015-02-06T16:03:44.885
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 85c98e5c9a3a8f1e9cf4d962b813aeda1300512b
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
++F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 4c057774e6138b9023fc16ec05639ddd3329b152
+ F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -155,7 -152,7 +155,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk 578612bd44492393c432ed3161b7a5aeced3d1ee
 -F main.mk 0bae136db3f3ce451079ae335124b46163d37020
++F main.mk 70be701bce2dccfcda7f91a315f435a5203e3d65
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -176,29 -173,29 +176,29 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 2dfa99acdb2cffd9ed70413ad9657fc9d141ee51
 -F src/btree.c 2a1245df0356a229bcd0fd87a8536b5067f16e82
++F src/btree.c 11945da2e526b6f02a7c24aaf7136adb131aefe9
  F src/btree.h 94277c1d30c0b75705974bcc8b0c05e79c03d474
  F src/btreeInt.h a3d0ae1d511365e1a2b76ad10960dbe55c286f34
- F src/build.c f5cfd7b32216f695b995bbc7c1a395f6d451d11f
+ F src/build.c eefaa4f1d86bc3c08023a61fdd1e695b47796975
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
  F src/delete.c bd1a91ddd247ce13004075251e0b7fe2bf9925ef
- F src/expr.c 7be80f7dc337329a24df45c2f3bdb2ea3b64c90e
+ F src/expr.c abe930897ccafae3819fd2855cbc1b00c262fd12
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
 -F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
 +F src/func.c e331a645ae437de0089d9789f678073a114c804d
  F src/global.c 12561d70a1b25f67b21154622bb1723426724f75
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c b5d472b9b1354f0eb027f6e0ff0a698f7bf70510
 -F src/main.c 17e3a37374f3c13e27311773c30720b61584f5b9
++F src/main.c 47994ce8caf7e02e93db6a531cb6b592293e206f
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -217,40 -214,40 +217,41 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c aefeaf915aaef9f81aa2645e0d5d06fa1bd83beb
 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb
 +F src/os_unix.c 06e10d7aaf6b06947d9da35b38ff05000bf5058f
- F src/os_win.c 659d2ea531c671e5322d896f61011253786e8e70
- F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
++F src/os_win.c 1d1ef630b3e3859b7399952909e10d3a4d43fc77
+ F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
  F src/parse.y c5d0d964f9ac023e8154cad512e54b0b6058e086
  F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf
- F src/pragma.c d9bd64b0ca977e08a1cd2d19743a91fafa01f205
 -F src/pragma.c ea0be138a99784b14e87bd4522fea40e7b979e9c
++F src/pragma.c f5c1ba06527a2d72955637e46075a85765f4ad6e
+ F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
 -F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9
 +F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167
- F src/printf.c ea82bcb1b83273b4c67177c233c1f78c81fc42f9
+ F src/printf.c 05edc41450d0eb2c05ef7db113bf32742ae65325
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c eb792a4eb88e316a8450d7e11d154fe945889371
- F src/shell.c 5b8e786a7c8eec87fa3f2ea615b337d2d99e284c
- F src/sqlite.h.in c5c116e853f01b0d16a128d4f63a80f4fb0ede3f
 -F src/select.c 1f2087523007c42900ffcbdeaef06a23ad9329fc
++F src/select.c 30da05ba96c2b096a809b0d078fc4d0826e030d0
+ F src/shell.c 82c25508dac802b32198af6f5256ca1597c6a1af
 -F src/sqlite.h.in 54678c21401909f72b221344dd560d285a1ba5eb
++F src/sqlite.h.in 886a2a306f811f06ede879493731dfe991224a6e
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h b20f54ab2456f39ceb420f518314101f110d4973
 -F src/sqliteInt.h c4e05f7489cd300f856e2283d5e61302ce826471
++F src/sqliteInt.h 82a4ddf7b38835c3062adff3b9db0c784312e134
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c 0bbb44543175ef2033d39780a233f98bf354eff9
- F src/test1.c aefeee7e7663454cf6197061df4837ead844d15b
+ F src/tclsqlite.c b8014393a96a9781bb635c8b1f52fc9b77a2bfcf
 -F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
++F src/test1.c 1fe65ec71cf2eae982c70cf80127d502d46bb341
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
- F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
- F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
+ F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
+ F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
- F src/test7.c 72b732baa5642f795655ba1126ea032af46ecfd2
- F src/test8.c df8dd4c99c1dd2225cb2a6f334299cddc5dcf1f1
+ F src/test7.c 9c89a4f1ed6bb13af0ed805b8d782bd83fcd57e3
+ F src/test8.c 610e3d523018ca63b08081795e76794a2121ec38
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
@@@ -277,37 -274,37 +278,37 @@@ F src/test_osinst.c 3d0340bc31a9f3d8a35
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
  F src/test_quota.c 180813f43683be5725458fc1ff13ac455d8e722d
  F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d
 -F src/test_rtree.c fdd8d29ca5165c7857987a2ba263fac5c69e231f
 +F src/test_rtree.c bfe6f4386517f70054311109f3528adffec34485
  F src/test_schema.c 2bdba21b82f601da69793e1f1d11bf481a79b091
  F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe
- F src/test_sqllog.c c1c1bbedbcaf82b93d83e4f9dd990e62476a680e
+ F src/test_sqllog.c b690c12933f50ff46491e0d56a251f84ae16e914
  F src/test_stat.c 9898687a6c2beca733b0dd6fe19163d987826d31
 -F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c 2e21ca7f7dc54a028f1967b63f1e76155c356f9b
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
- F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
- F src/test_vfs.c 8ee7be45fe773a150b4015ef957da960179ee43a
+ F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
+ F src/test_vfs.c 5a14c63da9579ba148138c1fb233100f2eb58ebb
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/threads.c 2fb3ea4d70d5acf68b539c2489b4adace61cc01b
+ F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c e00458c9938072b0ea711c850b8dcf4ddcb5fe18
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
 +F src/vdbe.c 0fa93ce5135f2083abcb28e854be3b4b49477eac
  F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
  F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5
 +F src/vdbeapi.c ad6b1bde19d27ec5b278af4a8182ff60fdae5bc3
- F src/vdbeaux.c 65d2516652fa8d171085a2ae4a04f76545c633c1
++F src/vdbeaux.c 7069b951a45fb7eafed15bd358ae2f35356f33ad
  F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
- F src/wal.c 895b26c4c5fe9139f676d9bd64cf7e72563b6705
 -F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe
 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
++F src/wal.c 61a28dad1a098848a09702a938d515edde5c5a09
 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
  F src/where.c d46de821bc604a4fd36fa3928c086950e91aafb1
  F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
@@@ -726,14 -723,14 +728,14 @@@ F test/mallocG.test 0ff91b65c50bdaba680
  F test/mallocH.test 79b65aed612c9b3ed2dcdaa727c85895fd1bfbdb
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
- F test/mallocK.test 3cff7c0f64735f6883bacdd294e45a6ed5714817
+ F test/mallocK.test 223cc80c870c80d4a9c2014e94133efdf0123f82
  F test/mallocL.test 252ddc7eb4fbf75364eab17b938816085ff1fc17
 -F test/malloc_common.tcl 3663f9001ce3e29bbaa9677ffe15cd468e3ec7e3
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl c34d5b7f337336a7f2e30a197f1cf2646dbe8e76
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test fcb5297b321b562084fc79d64d5a12a1cd2b639b
 +F test/memdb.test da09b7f354f3dc0b74d992f5451ae03ebfb36920
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 -F test/memsubsys1.test 690d142525a7d31efb638b0d232e25fac3afeb1a
 +F test/memsubsys1.test ab9e5d4268f19d08ee06fdd9b3b5c678083224e7
  F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
  F test/minmax.test 42fbad0e81afaa6e0de41c960329f2b2c3526efd
  F test/minmax2.test b44bae787fc7b227597b01b0ca5575c7cb54d3bc
@@@ -774,9 -771,10 +776,10 @@@ F test/orderby4.test 4d39bfbaaa3ae64d02
  F test/orderby5.test 8f08a54836d21fb7c70245360751aedd1c2286fb
  F test/orderby6.test 8b38138ab0972588240b3fca0985d2e400432859
  F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
+ F test/orderby8.test 23ef1a5d72bd3adcc2f65561c654295d1b8047bd
  F test/oserror.test 14fec2796c2b6fe431c7823750e8a18a761176d7
  F test/ovfl.test 4f7ca651cba5c059a12d8c67dddd49bec5747799
 -F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
 +F test/pager1.test 1c39b52a036afd0813fdd47c9d2ebc83dec8fd90
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
  F test/pager4.test a122e9e6925d5b23b31e3dfef8c6a44bbf19590e
@@@ -789,7 -787,7 +792,7 @@@ F test/pcache.test 488061b5dd685df2234d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1
- F test/pragma.test 7d7823c30925e6c18da6bf7bb4436b762188527f
 -F test/pragma.test 6cf0f0ce4618e841457aa42745afda55ddbc95fe
++F test/pragma.test ad028e69dc67bfa19ac1d057e5619cdef73cf9a4
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -890,11 -888,11 +893,11 @@@ F test/speed3.test d32043614c08c53eafdc
  F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
  F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
  F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
- F test/speedtest1.c e4e2aa37ff66bad9f414a50a8cb9edfaac65c9e5
+ F test/speedtest1.c 2b416dca3a155fcaa849540b2e7fc1df12896c23
  F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49
  F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9
 -F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
 -F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 +F test/stat.test 1e5faf39649a0bb368770f780f926847520ea3f4
 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f
  F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9
  F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
@@@ -1126,32 -1124,32 +1129,32 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test ea8778d5b0df200adef2ca7c00c3c37d4375f772
 -F test/wal.test 885f32b2b390b30b4aa3dbb0e568f8f78d40f5cc
 -F test/wal2.test 1f841d2048080d32f552942e333fd99ce541dada
 -F test/wal3.test b22eb662bcbc148c5f6d956eaf94b047f7afe9c0
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 88b5d9a6a3d1532497ee9f4296f010d66f07e33c
 -F test/wal6.test 527581f5527bf9c24394991e2be83000aace5f9e
 +F test/wal.test 0ae504805b7e41b64a55fb5b7745de5ca2a0db2a
 +F test/wal2.test 703b87c21c1e3e169d607158de414c7c2655b93e
 +F test/wal3.test de822707fbc8e9d056edc895adfb8abcccee4590
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
- F test/wal5.test 67a92d812f3aee443d361737836914159690efe0
++F test/wal5.test 03043461be964ff80df96d629a7f8db1a95e1b37
 +F test/wal6.test 54ac71d59046014c70ad78957139984c5bfb7eb2
  F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test c35dd183708148120928dca908641c361f58062c
  F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 -F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
 -F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
 -F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
 -F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 -F test/walfault.test 1f8389f7709877e9b4cc679033d71d6fe529056b
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test 34422d1d95aaff0388f0791ec20edb34e2a3ed57
 -F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 67339b9e54db0cdaaf21287349bc8056e2919f96
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
 +F test/walcksum.test 932d12a2a36fb2765560d35e7eaa1e5f0b198385
 +F test/walcrash.test 011e05e9170da888851cb9ec4276bb1894ad32e3
 +F test/walcrash2.test 6eb6842d34cc5955726264c80566963c32a9cbea
 +F test/walcrash3.test 279640ffafa23f7564529ccd69bfb97849ccae9d
 +F test/walfault.test f4160abd02d583d06d7ea9554e7a3f749f6b3410
 +F test/walhook.test 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 256ea9380825a34be43e8ff02bd1e240f1f62e8c
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c13f5a12fbd9d81e58f49875dc9dd8a52a84cf03
  F test/where.test 28b64e93428961b07b0d486778d63fd672948f6b
  F test/where2.test 23fdb5d8e756554aad4ca7ae03de9dd8367a2c6e
  F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
@@@ -1205,10 -1203,10 +1208,10 @@@ F tool/logest.c eef612f8adf4d0993dafed0
  F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f
  F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b
+ F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
- F tool/mksqlite3c.tcl 87e1e7a67acf3608633f0acb12a860c342628e44
 -F tool/mksqlite3c.tcl 6b8e572a90eb4e0086e3ba90d88b76c085919863
++F tool/mksqlite3c.tcl 1c68493ffa2f1f17ae9c984623a3bb9401f7e848
  F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
@@@ -1241,7 -1239,7 +1244,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P cc7808427f8e9df8e2810a6681b2ddd93e578c67 7d68a42face3ab14ed88407d4331872f5b243fdf
- R 736a6a29fb38bc726ce5f27cd8e8ec8c
 -P 0a3100a7f264ffce6078c35e341f2f0af6c09fbb
 -R a582dddcff23f4b3aa0ab625ed7ba566
++P 518621f8dcd6c0cc107110991753731a19b263f6 0f65a7e2e09f801b66897479d501607caeae4abf
++R 694a381aaaf28d74eacd2ee4fda12681
  U drh
- Z aa9817599eedc2800d3e870eb012e1f7
 -Z 91c27780af6a4d5e0c7b8a8aa90c189d
++Z cac64b70477296f7a2a9f3e5049107a7

diff --cc manifest.uuid
index aeea87755caf771fc07587c50d7a6e04a8a6d2ac,408d77792ff8504d54bf595aa21141b7b251c81a..328459f93c698391670405830c2d5e5d07957c81
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 518621f8dcd6c0cc107110991753731a19b263f6
 -0f65a7e2e09f801b66897479d501607caeae4abf
++44711921fea2bb2d804d57b23872ab84156a04ba

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/pragma.c
Simple merge

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

diff --cc src/wal.c
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc test/wal5.test
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge