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

FossilOrigin-Name: 2a99c0074aaabb4916d82464427be079d44d65e6

diff --cc manifest
index 2da522d95ab23bd0c587824a9141942d4b08a769,4f0a71bacab675f6df91ebe3ea7255990d1724df..37aacf15ede537db7300c9015106e0ad89b33581
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Update\sthe\sapple-osx\sbranch\sso\sthat\sit\sincludes\sall\sof\sthe\slatest\strunk\nchanges.
- D 2012-04-19T20:43:54.884
 -C Update\sa\stest\sin\sio.test\sto\saccount\sfor\s[05f98d4eec].
 -D 2012-05-01T14:21:57.706
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2012-05-05T01:03:31.058
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 +F Makefile.in 7bd2fa7753fc9de38994b8d4fa7f10deb19966a5
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
@@@ -170,26 -159,25 +162,26 @@@ F src/os.c 4c8c8d72a6c58ad2fde4865783e8
  F src/os.h 59beba555b65a450bd1d804220532971d4299f60
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 -F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
 -F src/os_win.c 5e9e933a412ab35de2a6506b3c6a8295b31b309e
 -F src/pager.c bb5635dde0b152797836d1c72275284724bb563c
 +F src/os_unix.c d1978ba892240d106f5c45a9ec588dfa54431df5
 +F src/os_win.c 12e76b4aa5426022939f92e894a5c20dd40be7f4
- F src/pager.c ce4fde5951bf71b4f5316ff5afd0219ff7e99b3f
++F src/pager.c 69429aeb2452cf61c524466315b76e8bc8c71dbd
  F src/pager.h ef1eaf8593e78f73885c1dfac27ad83bee23bdc5
  F src/parse.y eb054bb40a5bf90d3422a01ed0e5df229461727a
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
  F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
 -F src/pragma.c e708b3bb5704605816f617e0b1d63a5488060715
 -F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
 +F src/pragma.c 29db41fc84bd7853d6c7ef85f9f8bd56a8be4320
 +F src/prepare.c 4450a714a7ebb4b0ce4159087338e1159d083885
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 969ec2bc52db1b068054ecf5ddc74f244102a71d
+ F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 -F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
 +F src/select.c cf2f8f771bab6417e51a0f17b086a87bb74d624c
- F src/shell.c 11185a9a4574f363bd4268a2780d37480ae00040
+ F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
 -F src/sqlite.h.in 4338f299fc83dada8407358d585c0e240ecb76a3
 +F src/sqlite.h.in c8d096addc2814b900ee2e2b3b1f22ba56502d5f
 +F src/sqlite3_private.h 77bebe843a3eabfb7994990aab780d34d25819c7
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
 +F src/sqliteInt.h ec90f0d797bbc93dd849629f18513b57bfd9a787
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -227,11 -215,12 +219,12 @@@ F src/test_osinst.c 90a845c8183013d80ec
  F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
  F src/test_quota.c 9d6be9cd3bb132df2b964193b6a4ec850f50a210
  F src/test_quota.h ee5da2ae7f84d1c8e0e0e2ab33f01d69f10259b5
 -F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
 +F src/test_rtree.c a1bbfc30f14d2bad2f93dbea7dcc697c97a40c66
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
+ F src/test_spellfix.c 495535f3eb57acdc384572da570e869bb1834bf4
  F src/test_stat.c d7035cfcc0ff1f93c000b621f36524318e004e11
 -F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c e286f2173563f2a1747c24bcda6b9d030bf4f4e4
@@@ -253,13 -242,13 +246,13 @@@ F src/vdbeaux.c 88b9df24bcab179fbe7a39d
  F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
 -F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
 +F src/vdbetrace.c 2405f68d14c49d2e0a798d71e35d62b8569bfb65
- F src/vtab.c ab90fb600a3f5e4b7c48d22a4cdb2d6b23239847
+ F src/vtab.c ae657b1c22cff43863458e768a44f915c07bc0e4
 -F src/wal.c 7bb3ad807afc7973406c805d5157ec7a2f65e146
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 +F src/wal.c b5ba968e7d5a17f745b78b3acde2214ec985d21e
 +F src/wal.h a8ade3069ab75e3c79e9ca067a5ac7e1dbaf93a6
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 2112422a404dcca5d47f6630bdf180bccd36c62b
+ F src/where.c 8e9f01cd1604aa21cfa8e0258b7101e05082fa98
 -F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
 +F test/8_3_names.test 0ed0f6711fefac33829ef9f1d6ca3c56c48ef1c7
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
@@@ -701,6 -689,11 +694,11 @@@ F test/shared6.test 866bb4982c45ce216c6
  F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
  F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
  F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
 -F test/shell1.test 7dcd612b0018ddad783647d984fffa76791ffd3d
 -F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a
 -F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59
 -F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9
 -F test/shell5.test fa2188bbb13fe2d183fd04a5f7b512650c35ef5d
++F test/shell1.test 7dcd612b0018ddad783647d984fffa76791ffd3d w tool/shell1.test
++F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a w tool/shell2.test
++F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59 w tool/shell3.test
++F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9 w tool/shell4.test
++F test/shell5.test fa2188bbb13fe2d183fd04a5f7b512650c35ef5d w tool/shell5.test
  F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
  F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
@@@ -729,10 -722,10 +727,10 @@@ F test/sysfault.test c79441d88d23696fbe
  F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 1597d353308531527583481d14d9da52ea8ed0af
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl 7925398e4f994a8296ecbe81c8f3575941928e77
 -F test/tester.tcl 17b5f402d0e60e8c8ce751288b228fe9337f40c2
++F test/tester.tcl fa6eaa416a0d3645262a2a34e11bbeece45b75da
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -746,10 -739,12 +744,12 @@@ F test/threadtest2.c ace893054fa134af3f
  F test/threadtest3.c 0ed13e09690f6204d7455fac3b0e8ece490f6eef
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
  F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
 -F test/tkt-2d1a5c67d.test b028a811049eb472cb2d3a43fc8ce4f6894eebda
+ F test/tkt-2a5629202f.test 1ab32e084e9fc3d36be6dee2617530846a0eb0b6
 +F test/tkt-2d1a5c67d.test 0e23cbbbecda6ce453ffb560fdac28489d491d36
  F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
  F test/tkt-31338dca7e.test 1f714c14b6682c5db715e0bda347926a3456f7a9
 -F test/tkt-313723c356.test c47f8a9330523e6f35698bf4489bcb29609b53ac
 +F test/tkt-313723c356.test 54a1558d2719e171bd88967d66c73be4c617ec55
+ F test/tkt-385a5b56b9.test 8eb87c4bbcc3fd4f33d73719de7e9d64973fa196
  F test/tkt-38cb5df375.test f3cc8671f1eb604d4ae9cf886ed4366bec656678
  F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
  F test/tkt-3a77c9714e.test 32bb28afa8c63fc76e972e996193139b63551ed9
@@@ -920,31 -915,31 +920,31 @@@ F test/vtabF.test fd5ad376f5a34fe0891df
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839
 -F test/wal.test 2fbf4bbd0cb03aff6ada8150f29808c79370d50b
 -F test/wal2.test 8871e7fd2c86711ff415a5817d68ea3101a15312
 -F test/wal3.test 6504bbf348b2d6dfade64a064f1050fd617e8706
 -F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 -F test/wal5.test f58ed4b8b542f71c7441da12fbd769d99b362437
 -F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
 -F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 -F test/wal8.test 5ab217d21f7e5e86af2933a4ffd0d8357cc2c0bd
 -F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 -F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
 -F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde
 -F test/walcrash.test 4457436593be8c136f9148487c7dccd5e9013af2
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walcrash3.test 595e44c6197f0d0aa509fc135be2fd0209d11a2c
 -F test/walfault.test 97394d8de82a99f7abf1c12ed229640607fd0ad2
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 -F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 -F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
 -F test/walro.test e6bb27762c9f22601cbb8bff6e0acfd124e74b63
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 -F test/walthread.test a2ed5270eb695284d4ad27d252517bdc3317ee2a
 +F test/wal.test 9c29891ca329de5bba41dfa26b855ca82950e01c
 +F test/wal2.test ea811f7bc9abbc4282700c8969b175c31e884045
 +F test/wal3.test ae86a92d41d81730278fca0b71368f3e78e9c64a
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 46a422956ec203bc5899dad5e70d9e655b1c91e4
 +F test/wal6.test c561d1e44c89f9cb458a7b03003ed4baac08ba07
 +F test/wal7.test 18cf68ab8010ae0a2baaa48e5b59567a9503e63e
 +F test/wal8.test a0b7dee73fc3d3bbf167e04533d37df379a0b7d1
 +F test/wal_common.tcl 15f152fd55703975878741beca6cfa4209d5b3b3
 +F test/walbak.test 8edea4daad739587f049633071d0f063fa808049
 +F test/walbig.test 3ca3d94751b80054eed5bda20a1339ae1f619483
 +F test/walcksum.test 6510e82303f6fffc2c55bb77a7774cd0eed21a6e
 +F test/walcrash.test a8fa8d8a9a50a49b7abaf8a4a7e2c7ea352c49be
 +F test/walcrash2.test c032d0040374ae28b41f99fc0cc290b4e2e34f17
 +F test/walcrash3.test 97e775404f4c76e5c46f71fbd09691c7e9c25c68
 +F test/walfault.test e5309befcaf4ab08151c35dba20cc5b8a5846748
 +F test/walhook.test 9716f865303130d7fcda61bcabb863090be9cca2
 +F test/walmode.test 9308ffc25555a1c4eaa44a863792240406637496
 +F test/walnoshm.test b1337ce99aabdf4da7a4a3f0c5ce1f05450bc3cc
 +F test/walpersist.test 12d1a54a5d5e06af0ec4bbd5421608a957ed8630
 +F test/walro.test 04d6382b2a87cfc82b87336eb8d8a8e9afd8bcf8
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c3aaf9ef7ad21ae79c2345425bfddb39cdac954f
- F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
+ F test/where.test 4c9f69987ed2aa0173fa930f2b41ab9879478cd8
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
  F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
@@@ -1005,7 -995,7 +1000,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 86b8481be7e76cccc92d14ce762d21bfb69504af 3281972eaa46cb57fd9f0387063f47430dc0a3b4
- R 7ff10cf8ec4e430ab15c15c36f6c9d99
 -P 1e51bffe777587cd05bd7db5e02d6291c3eb8c1a
 -R 2c954175673c357079573f576ee6e960
 -U dan
 -Z 199b9a45180c95acb6ae422881191984
++P b72f07b4a2cf62ac1b52d432f13057d5d93a4ec4 bfa61e781cb442be641486e7e55a1518e888d830
++R dd82e74bcdab2fda6d096f215441e239
 +U drh
- Z e85d9933f100757e607594cd6fe7ac76
++Z 7cba0cb59bdfe5fcf9605e6cbb5a3583

diff --cc manifest.uuid
index f1ab5f9d04d0511898ef77b35d37d9909cbe484c,8d74f647e35e9b57920688894fb8c5d0d914a175..5bb93f73482b1424770a5df995c83baa9714098c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b72f07b4a2cf62ac1b52d432f13057d5d93a4ec4
 -bfa61e781cb442be641486e7e55a1518e888d830
++2a99c0074aaabb4916d82464427be079d44d65e6

diff --cc src/pager.c
Simple merge

diff --cc test/tester.tcl
Simple merge