Merge the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: 59e0d4f3d9af81d0c920812a6583228faa300cd6

diff --cc Makefile.in
Simple merge

diff --cc manifest
index 9d6df7a8e280d169295dfb55a7d43aabb29c6f4e,49900ac0bee095354b35d6e125a0b081b30a38c8..7d4041411ee0ffdc272a2803a375889a70ab4f2d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sa\sproblem\swith\ssqlite3_backup_step()\sthat\sresulted\sfrom\sa\sfaulty\smerge.
- D 2011-10-31T19:59:09.047
 -C Hand\smerge\sthe\szone\sallocator\sfor\sMacOS\sfrom\sthe\sapple-osx\sbranch.
 -D 2011-12-08T20:41:33.299
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-12-08T21:08:53.430
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in acb1a0b8fe8029196afe437f64ead3301731b6f0
 -F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
++F Makefile.in 44bbe5a7c5c58b28d5dc310cfedcf8f35b4b39e5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
+ F Makefile.msc 3bd3641a345d488a9601c0cc7f9d35aeede5d12b
  F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION bb37c274b503bbe73f00ea4f374eb817cba4b171
+ F VERSION af03cd6400f9d71d38bdb7a9d66a1aefdc2f3e0d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -128,32 -125,32 +128,32 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 4368158da74d4711888e03264105c5c527d76caf
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 601b808e1f1e7d0d17270f6103c5759633f5f76f
 -F src/btree.c 80ea65224512884bb72976c93810d2dcaecc1353
++F src/btree.c 46eae4a082c1515ac50dd14542b7e7ae7cc7916a
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
- F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c 8af67a08a852ff4c63701963cb1ab7166f577814
+ F src/btreeInt.h ea863a819224d3e6845ad1e39954d41558b8cd8b
+ F src/build.c 8915bb6d72ead998f94c2756ea8d143c77709b70
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
- F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
- F src/expr.c fbf116f90cabc917ae50bba24a73a0b55519a0c8
+ F src/delete.c 51d32f0a9c880663e54ce309f52e40c325d5e112
+ F src/expr.c 9ac5831769dddee6a55b07cdd439b21929bbe4e7
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
 -F src/func.c 6261ce00aad9c63cd5b4219249b05683979060e9
 +F src/func.c 8c5a50e75fcc974e10aad0765d215a10038abacb
- F src/global.c e230227de13601714b29f9363028514aada5ae2f
+ F src/global.c 107ccaacb4b30895cf3a3a39decf417c804acfa1
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c ca18783512323f74aaf4ee74b46ffd75ec80d031
+ F src/insert.c 8f283d6734dd837ed7531b26d7622fda70874390
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c d0d2022a5a07274d408820b978b9e549189d314f
- F src/main.c d2a0879801225b8f558b40a05ee044b0c6cf6fde
 -F src/main.c 8be1ee70dd90ef7562c801dbe946a4f9f93bb128
++F src/main.c 4e8b24368b7df83e225a9bed2bd2f967cf0c57be
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c f96706e354e5e540305ba4cfe315fe52173a9f9e
 +F src/mem1.c c390a8fce10912a770ebe6fa031f5f463649e7ae
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -165,35 -162,34 +165,35 @@@ F src/mutex_os2.c 882d735098c07c8c6a547
  F src/mutex_unix.c b4f4e923bb8de93ec3f251fadb50855f23df9579
  F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
- F src/os.c c7a716e36875fb993b6e4f99cae954d504411285
- F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 -F src/os.c 28bbdab2170dfce84d86c45456a18eab1d0f99a9
++F src/os.c 499fc9d390b2b2294117ec2a32740ce49158e1d5
+ F src/os.h 5830d32c4dab94fa0373404a139ada670e800731
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c c70a44872d019b9863996658bab0b20e1ff49c6e
- F src/os_win.c 4e61b811ab33d5509e0d96f758f9a9132963fff2
- F src/pager.c 52530f16c3fbaa7f73303338b4d841b857234b28
- F src/pager.h 9f81b08efb06db4ba8be69446e10b005c351373d
- F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
- F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
- F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
- F src/pcache1.c 24f5e85a78514584b46190260ba7ab0a66312197
- F src/pragma.c a09bfb67bca3d3a9292c1c85a816f4d4337a006e
- F src/prepare.c 9d7403fe75fefa134351b41400d09ba1b189134b
 -F src/os_unix.c 4fbb91726165e105c1679a2660f49a3f4c376e4f
 -F src/os_win.c 8af100f78f157eb6185fd9153d7f35b829c4da04
 -F src/pager.c d981f3bfcc0e4460537d983899620700ccf8f539
++F src/os_unix.c fa4ef25eb05312d1f9d3ef1b497004fc3a3c5271
++F src/os_win.c 4c546bde0de55f2b5e59fbf250b9e4094fc28892
++F src/pager.c 9d31fa7d47b7b534503e08110d0b2bded03143d7
+ F src/pager.h 5cd760857707529b403837d813d86b68938d6183
+ F src/parse.y d02cc7bdb9ba11fb7aa212f55f99e59e4ee55439
+ F src/pcache.c 1fdd77978c1525d1ca4b9ef48eb80abca710cb4c
+ F src/pcache.h b1d8775a9bddf44e65edb0d20bfc57a4982f840f
+ F src/pcache1.c 9d735349ac87ef08076c6b1230f04cd83b15c6da
 -F src/pragma.c dd66f21fafe7be40e1a48ad4195764cc191cf583
 -F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
++F src/pragma.c dae8d30795e6c3d1a5597108ed1fa00275ce339a
++F src/prepare.c 4450a714a7ebb4b0ce4159087338e1159d083885
  F src/printf.c 03104cbff6959ff45df69dc9060ba6212f60a869
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 365ab1c870e38596d6869e76fb544fe6e4ffc809
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 8d0e30602418d112db04c4c2d2cf20fd9580e8b9
- F src/shell.c f0ab793261ab045a0b8c47fa2707e8a894d2898f
- F src/sqlite.h.in 016de67059ae3b00963e927c675404903eba8a01
 -F src/select.c 538b5f096f6aacedf717bf982f9ad9a901008514
++F src/select.c 2849781d42e952a483bd029acfde69c6733fce06
+ F src/shell.c 29812a900a780eb0f835c4bc65e216272689def8
 -F src/sqlite.h.in 57081d8e6b53ce29541d7437c93bce6087ac53b5
++F src/sqlite.h.in 1f4434d5d28d8df0868e3dfdeb5c1a4d68f212c3
 +F src/sqlite3_private.h e3b586e0aa329075d99be7198df9bc80c5b19e2d
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 65a6ba854a1b0167cdcbd0c5096602fe899da08c
 -F src/sqliteInt.h 142ef5ed3fe0e6c662e99dbf92f38715b29a53b6
++F src/sqliteInt.h 78c821539e360e9c5b6b06526ade1e3069f90388
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c de581e2e71f5e7f98366156afad83b4742ac6fe0
- F src/test1.c 63a00ab722cc49025a6f675bcda39bed83663a48
 -F src/test1.c fe455fc1be1b0dbf4ce45b11c255900e8ae18da3
++F src/test1.c a6fb512db6f57f5727d65455e415232d7784a89f
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -204,9 -200,9 +204,9 @@@ F src/test8.c 99f70341d6ec480313775127f
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 -F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 +F src/test_backup.c 64fd6173ad99daade1227aa17c3ca0d18fa5e5fa
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 6912d4d1b398c69dfbb5eaa50595d31d89653086
 -F src/test_config.c a036a69b550ebc477ab9ca2b37269201f888436e
++F src/test_config.c 7f1aa0d93f76c2657bfa00a54e5837ab9af1a912
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -223,9 -219,9 +223,9 @@@ F src/test_multiplex.h e99c571bc4968b7a
  F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
  F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
  F src/test_osinst.c 62b0b8ef21ce754cc94e17bb42377ed8795dba32
- F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
+ F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
  F src/test_quota.c a391c866217e92986c6f523f05b08aa6956c8419
 -F src/test_rtree.c 6d06306e29946dc36f528a3a2cdc3add794656f1
 +F src/test_rtree.c a2eebb68c0f1463918cdfbe603cb2e869c551038
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
  F src/test_stat.c 69de4361c7a69fc1136d31ab7144408cd00805c7
@@@ -241,22 -237,22 +241,22 @@@ F src/tokenize.c c819d9f72168a035d545a5
  F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
  F src/update.c 25e046a8f69d5e557aabde2000487b8545509d8d
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
- F src/util.c df83983bd57057df4951516880066b42b7055269
+ F src/util.c 01238e2b0f24a14779181dbf991fe02620a80e31
  F src/vacuum.c 0c0ba2242355c6048d65e2b333abe0f7c06348fa
- F src/vdbe.c cefc9d9bbb9487a8d519de6dce11f8bc7cfbb406
 -F src/vdbe.c a7ab9993ec5a4d9479dc99671faec061fbf9b889
++F src/vdbe.c 6f7669fbd331dc01963d19850684f5252408fc98
  F src/vdbe.h f0725ee997db869ecae5bb70a71612aabeca7755
  F src/vdbeInt.h 9498fc98a2c9e349a4ef13455ff5a3e898f40176
- F src/vdbeapi.c a78a20bff2bb976aef5b9965d4f6ecedfcc2d586
- F src/vdbeaux.c dfe420bef5028dd41b3efb890d8b757dbe4b94b9
 -F src/vdbeapi.c 86189ebba2c49791d75eaa12929f3ce6527596bd
 -F src/vdbeaux.c 45713a5f8f4f36195f503b30153ddef292323f88
++F src/vdbeapi.c f3e684cb2f359c8e609f048af3c14e0cf33511b5
++F src/vdbeaux.c ab25ef4df8dc4dc3f5fda6593ceb1c5ff9216877
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
  F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
 -F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 +F src/vdbetrace.c 4b92fe7355f682368203d29b2be7125cbab85e79
  F src/vtab.c e9318d88feac85be8e27ee783ac8f5397933fc8a
- F src/wal.c ae9272089ec7bd1b5dba6eeb6909ff018e40632e
 -F src/wal.c 7e6e7fe68ee649505dca38c8ab83eda0d0d96ae5
 -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
++F src/wal.c 84d32c7a56f4ec44658ddb3ffcd1eb451c16af5c
 +F src/wal.h e75d87752bd5df3dc4152ee2cb3b0dcd0b309e5e
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 7c85f4c93058e27100d404f0777aaeb0d1b296ae
+ F src/where.c f73752ca85c0ed221753fda98aeaf6b9d4616e0e
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@@ -278,7 -274,7 +278,7 @@@ F test/async2.test c0a9bd20816d7d6a2cec
  F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c
- F test/attach.test a1ddc40e5d7f7a81963ebf9bd76d727f9e9ba00c
 -F test/attach.test 0d112b7713611fdf0340260192749737135fda5f
++F test/attach.test 63033baa59be42c811ef0d4e73ebd2d6dba4805c
  F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966
  F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e
  F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
@@@ -592,12 -587,12 +592,12 @@@ F test/mallocH.test 79b65aed612c9b3ed2d
  F test/mallocI.test a88c2b9627c8506bf4703d8397420043a786cdb6
  F test/mallocJ.test b5d1839da331d96223e5f458856f8ffe1366f62e
  F test/mallocK.test d79968641d1b70d88f6c01bdb9a7eb4a55582cc9
 -F test/malloc_common.tcl 2930895b0962823ec679853e67e58dd6d8198b3c
 -F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 +F test/malloc_common.tcl 11838863dc689f2d2b10896c8f4276771a60b42f
 +F test/manydb.test 3cd8e52ab3112cb8365afeedd6e8231977920577
  F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 -F test/memdb.test 708a028d6d373e5b3842e4bdc8ba80998c9a4da6
 +F test/memdb.test 499d199e612bc229f52d1c46c6038deeef93d1f2
  F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
- F test/memsubsys1.test fe8b830abe6317c615927b90d9edf48180b591c2
 -F test/memsubsys1.test a8f9e37567453a5d1d9d37ec102d4d88ab6be33f
++F test/memsubsys1.test f431d42296dc502d4dbc19a6f89a76e46d74275f
  F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
  F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
  F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
@@@ -610,7 -605,7 +610,7 @@@ F test/misc5.test 528468b26d03303b1f047
  F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
  F test/misc7.test eafaa41b9133d7a2ded4641bbe5f340731d35a52
  F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
- F test/multiplex.test 6771925b61c19fdbdb4739c1ef2a279c48b48a75
 -F test/multiplex.test 770f0295dd6673e60458cb93abd033ed2f253291
++F test/multiplex.test bc145f28934ba677e41c618626cf6499488a59e3
  F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
  F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
  F test/nan.test e9648b9d007c7045242af35e11a984d4b169443a
@@@ -632,7 -627,7 +632,7 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  F test/permutations.test 522823b47238cb1754198f80817fe9f9158ede55
- F test/pragma.test 86344e113584d7156a6e3a1a2e168293629b3ba3
 -F test/pragma.test 7fa35e53085812dac94c2bfcbb02c2a4ad35df5e
++F test/pragma.test 76d644288007c7eb74650ab6e261e6f78e48cb0f
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -702,17 -698,17 +703,17 @@@ F test/subquery.test b524f57c9574b2c034
  F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
  F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
  F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
 -F test/superlock.test 7b1167925e9d30a5d1f0701d24812fdda42c3a86
 +F test/superlock.test 942b75cfe0f939086715a5dc74fa4ba57a5e8d5e
  F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85
- F test/syscall.test 966addf703faee6a5d509abe6d8885e393e552fd
+ F test/syscall.test 2a922050dbee032f587249b070fb42692f5e1e22
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 5ebcbb0dccc3fbc1edc3bba84c38e2c2d574c5aa
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl 73327b8ef71ac6338a8811f6e3dee41715332f08
 -F test/tester.tcl 001051eaf28c1040800f588a64c63e0bd0e1f36b
++F test/tester.tcl a2c3874cb3768d4369940e7235871f8a85a75580
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -898,28 -895,28 +900,28 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
- F test/wal.test fa19bdb3be5103b69052cc6c4bf86df54c845a59
 -F test/wal.test c743be787e60c1242fa6cdf73b410e64b2977e25
 -F test/wal2.test ad6412596815f553cd30f271d291ab003092bc7e
 -F test/wal3.test 18da4e65c30c43c646ad40e145e9a074e4062fc9
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test 1bbfaa316dc2a1d0d1fac3f4500c38a90055a41b
 -F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
++F test/wal.test 0f5438398f60807d129134aaac62f6e7ad99f251
 +F test/wal2.test cc834aa5e4361b472d115f7c8148e4d168e4db8c
 +F test/wal3.test b9b6477ef354fea2066083e5badbc08bba45f5b0
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 3ef2b561d0e218b73b86f2223ec3d8f09cadc3ca
 +F test/wal6.test c561d1e44c89f9cb458a7b03003ed4baac08ba07
  F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test 0ab8a430ef420a3114f7092e0f30fc9585ffa155
 -F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde
 -F test/walcrash.test 4fcb661faf71db91214156d52d43ee327f52bde1
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walfault.test efb0d5724893133e71b8d9d90abdb781845a6bb0
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test b30cbbb2996947c96a2e562020dff61013a17a96
 +F test/walbig.test 44141082891fb91bcfa793fb6411605ac42830eb
 +F test/walcksum.test 3dff8817d31a4207d1ad31e7da06073a34e7fe1c
 +F test/walcrash.test e2e8de53cadda0e1c5ceb86ff762b85aed2771cc
 +F test/walcrash2.test c032d0040374ae28b41f99fc0cc290b4e2e34f17
 +F test/walfault.test c54e6a304d631565a12998fd1d4665ded7a18ee2
 +F test/walhook.test c934ac5219fee2b4e7653d291db9107b8dc73bba
 +F test/walmode.test 9308ffc25555a1c4eaa44a863792240406637496
  F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
- F test/walpersist.test fd40d33765b2693f721c90c66d97f99757559006
+ F test/walpersist.test 710b1b6cf6f8333e984f437724d1fa9e0511c5aa
  F test/walro.test e6bb27762c9f22601cbb8bff6e0acfd124e74b63
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test a2ed5270eb695284d4ad27d252517bdc3317ee2a
 +F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 +F test/walslow.test 3c2475d7672511380d33cef1924a065d2ad62ff0
 +F test/walthread.test 3decc7e72594e0270dc1a1cc0984d6db7165b4cc
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
@@@ -979,7 -977,7 +982,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P b2f7639c8faf962239d41bb3a151448fad84e84c
- R 8d574b43105259909dffa0ccb1362b89
 -P 9687b305c2320109a8649612181eecd2e0da7c7b
 -R 83ba2438b14dfac192d8fdfea2ba6d38
++P dacdec78d010922b6357f5319108289d087b6028 0d955c20c02da29582b5cd8df2b7124fb9d12ebb
++R 7d02ae07e22c3d68edcb279ac80c5560
  U drh
- Z 26dda03107425061088e3704204c7d17
 -Z a86d3022d423432c98b77483099e12da
++Z c635329dcd75987bcf764cde7adde70c

diff --cc manifest.uuid
index a3a341ab5b964f9db07c93f21e92ae1d9225d433,199e8418f594ba659fe3c736094925d3976e17b8..2824edbc76801cfb842d630a9d3be4a3fe3c9147
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dacdec78d010922b6357f5319108289d087b6028
 -0d955c20c02da29582b5cd8df2b7124fb9d12ebb
++59e0d4f3d9af81d0c920812a6583228faa300cd6

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
index 66067bbf61f35eb7de2e3ec9231b7a83966a2bff,8562a90727cba5979d9443681c6740fe3f682a67..a2edada58cbe05a0e28a98380f8f9e2f1973b701
--- 1/src/main.c
--- 2/src/main.c
+++ b/src/main.c
@@@ -2990,26 -2964,16 +3001,40 @@@ const char *sqlite3_uri_parameter(cons
    return 0;
  }
  
+ /*
+ ** Return the filename of the database associated with a database
+ ** connection.
+ */
+ const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName){
+   int i;
+   for(i=0; i<db->nDb; i++){
+     if( db->aDb[i].pBt && sqlite3StrICmp(zDbName, db->aDb[i].zName)==0 ){
+       return sqlite3BtreeGetFilename(db->aDb[i].pBt);
+     }
+   }
+   return 0;
+ }
++
 +#if (SQLITE_ENABLE_APPLE_SPI>0) && defined(__APPLE__)
 +
 +#include "sqlite3_private.h"
 +
 +/* 
 +** Testing a file path for sqlite locks held by a process ID. 
 +** Returns SQLITE_LOCKSTATE_ON if locks are present on path
 +** that would prevent writing to the database.
 +*/
 +int _sqlite3_lockstate(const char *path, pid_t pid){
 +  sqlite3 *db = NULL;
 +  
 +  if( sqlite3_open_v2(path, &db, SQLITE_OPEN_READONLY, NULL) == SQLITE_OK ){
 +    LockstatePID lockstate = {pid, -1};
 +    sqlite3_file_control(db, NULL, SQLITE_FCNTL_LOCKSTATE_PID, &lockstate);
 +    sqlite3_close(db);
 +    int state = lockstate.state;
 +    return state;
 +  }
 +  return SQLITE_LOCKSTATE_ERROR;
 +}
 +
 +#endif /* SQLITE_ENABLE_APPLE_SPI */

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
Simple merge

diff --cc src/pragma.c
index 78a7a1dabe707b79fb4e54c037bb108b425c664c,bfdcb2370ac134c20d22ed8d4798baa626edacab..1ed1214d3118ec1034ee7baddd612be89baccdad
--- 1/src/pragma.c
--- 2/src/pragma.c
+++ b/src/pragma.c
@@@ -712,10 -701,9 +716,10 @@@ void sqlite3Pragma
      if( sqlite3ReadSchema(pParse) ) goto pragma_out;
      assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
      if( !zRight ){
 -      returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
 +      i64 cacheSize = pDb->pSchema->cache_size;
 +      returnSingleInt(pParse, "cache_size", &cacheSize);
      }else{
-       int size = sqlite3AbsInt32(sqlite3Atoi(zRight));
+       int size = sqlite3Atoi(zRight);
        pDb->pSchema->cache_size = size;
        sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
      }

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

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc src/wal.c
Simple merge

diff --cc test/attach.test
Simple merge

diff --cc test/memsubsys1.test
Simple merge

diff --cc test/multiplex.test
Simple merge

diff --cc test/pragma.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal.test
index 18b48ec776197de571b564be5965adce365a6557,1c63ddc00f3f765156b62f1f94fb57bffbcc5370..bf639f214e9c79a9ab8e398764836a2c7cac46d3
--- 1/test/wal.test
--- 2/test/wal.test
+++ b/test/wal.test
@@@ -1131,8 -1125,8 +1132,9 @@@ foreach {tn sectorsize logsize} 
      execsql {
        PRAGMA auto_vacuum = 0;
        PRAGMA page_size = 512;
+       PRAGMA cache_size = -2000;
        PRAGMA journal_mode = WAL;
 +      SELECT * FROM sqlite_master;
        PRAGMA synchronous = FULL;
      }
      execsql {