Merge trunk changes with apple-osx branch.

FossilOrigin-Name: bf57f0fb73500f384fc57cbe2501343c97dc433e

diff --cc manifest
index 2a33d01b51eb8105e8c3d24d015438b2a96d83bc,36cfd7d06451e9623b4892e19bd83b0ee6d296ab..5d0b41888fa624562def62c6c45727d9c511a461
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Make\ssure\sthe\sWAL\sfile\sis\sdeleted\swhen\schanging\sto\sDELETE\sjournal\smode.
- D 2012-05-11T00:56:28.845
 -C Before\srunning\seach\stest\sscript,\smake\ssure\sthe\sFTS\senhanced\squery\ssyntax\sis\sdisabled.
 -D 2012-05-12T05:30:29.959
++C Merge\strunk\schanges\swith\sapple-osx\sbranch.
++D 2012-05-12T14:59:45.219
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 +F Makefile.in 957c9693400fca6cb8b533b589e69ddee7bcb27c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
@@@ -176,12 -173,11 +176,12 @@@ F src/printf.c 7ffb4ebb8b341f67e049695b
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
 -F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
 +F src/select.c cf2f8f771bab6417e51a0f17b086a87bb74d624c
  F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
- F src/sqlite.h.in b20e122611fc5a3113e298d38feabcb5796479a0
 -F src/sqlite.h.in 5f2eedc52ee7e9f8c560faf862cffbb86d81eb44
++F src/sqlite.h.in d9b3c24cd5e2cbe160bf8f9a8a01e3d2cbcbc631
 +F src/sqlite3_private.h 97a1e15b3a078bb583622da01a2e9bc96c6edf14
  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
@@@ -223,8 -219,8 +223,8 @@@ F src/test_rtree.c a1bbfc30f14d2bad2f93
  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_stat.c d1569c7a4839f13e80187e2c26b2ab4da2d03935
 -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
@@@ -246,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 ae657b1c22cff43863458e768a44f915c07bc0e4
 -F src/wal.c 7bb3ad807afc7973406c805d5157ec7a2f65e146
 -F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
 +F src/wal.c 1ff2ebb47ba29610abd768bf74cecd9c33049ebf
 +F src/wal.h ce626f1f9000caf09a99a6634a8d794686f92e1b
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
- F src/where.c 8e9f01cd1604aa21cfa8e0258b7101e05082fa98
+ F src/where.c 24c7494d8875ead994b4dfe5461340c27fd424ca
 -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
@@@ -630,10 -625,10 +630,10 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
- F test/pager1.test 99cf69a829f1724e17b427592804c54b80b7de0c
 -F test/pager1.test 31fef8ff6d5cbb4643f430e31756312d361ecfdf
++F test/pager1.test 717d4fbe95a704c0b08b22a85b06c077b898416d
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 -F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
 +F test/pagerfault.test a15ef77c8495882d7debb43794e87b6e46174c8a
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 9191867ed19a2b3db6c42d1b36b6fbc657cd1ab0
@@@ -728,10 -723,10 +728,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 fa6eaa416a0d3645262a2a34e11bbeece45b75da
 -F test/tester.tcl a55e066251bc05e26f9da00e76644ab649b26f3c
++F test/tester.tcl 713ddb69b5c2737aa879662e20ec59d708631ec8
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -921,30 -917,30 +922,30 @@@ 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 3b7e0c1a2a9a8c39e4e00124f18f14a74f366060
- F test/wal2.test 3e151660c09d9a3c273c2862b6a392ae6138784b
 -F test/wal.test b3d28d655371bf3f6500c679f526e9860544fe70
 -F test/wal2.test d5021064bebfc717fe2bf4db2536ea030b76a773
 -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 b03ffe24f722017c493bb512e53956583a271c15
++F test/wal2.test 0f616db53cbf93bbd7a8ef8b33f048a2b43d2f0a
 +F test/wal3.test ae86a92d41d81730278fca0b71368f3e78e9c64a
 +F test/wal4.test 5755887f321baa4c55de0b91066fa7d0cafcac9d
 +F test/wal5.test 187ae92cc9ba1ec6803681b9025cad89af1a8c69
 +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 67339b9e54db0cdaaf21287349bc8056e2919f96
 +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 5d2bdb04fd3e220e2f96e6b566d57e00020bdaec
 +F test/walmode.test aa45339b4afa435dde5d88e71a95459cc221a3f4
 +F test/walnoshm.test 559b878f3aab838971d820329ca35f1caa7b038e
 +F test/walpersist.test abd956d66e2f36d2d9d05d3a969f48be6d2ddbec
 +F test/walro.test 180321fa4e7cf7e98b5df232763c3e0781673a41
 +F test/walshared.test 04590b10c677f75318701818c50bc0dda5da64ab
 +F test/walslow.test 658066419a92d3bd85be71a11ce477af4ffe9153
 +F test/walthread.test c3aaf9ef7ad21ae79c2345425bfddb39cdac954f
  F test/where.test 4c9f69987ed2aa0173fa930f2b41ab9879478cd8
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
@@@ -1001,7 -997,7 +1002,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P e87702834ed50882fadb3dee66cafb7438f5e577
- R 67b6663c392833c5593ad88a2acfcac7
- U drh
- Z 5163acdc76291ae8073d5c6ee58991cb
 -P 93061c6e063fddfa6b5d21064a36b58cc97599f1
 -R 1266fdc6649c7c37fc945bf3a68e25cb
++P 66708685909fb048edab7f15e4a81d5a554d88d9 f84d87bcc0e4f6f56d01556b2b1dc27ebef9ce26
++R 98d3ac84a2d85402687ea4fe3a44e77d
+ U dan
 -Z efae0d0fc97871bb7b1020786a272a5c
++Z 7e01eaeda0cc16cdaaff0ca05577b01d

diff --cc manifest.uuid
index d52df065b4a7b47b10631ecd2c9aa2b5d6f118ee,beee1a4763cc1bd03332e76d923bf3c10ab22eda..986b53681e23378b2f6f9c95bd691eb36c8901e3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 66708685909fb048edab7f15e4a81d5a554d88d9
 -f84d87bcc0e4f6f56d01556b2b1dc27ebef9ce26
++bf57f0fb73500f384fc57cbe2501343c97dc433e

diff --cc src/sqlite.h.in
Simple merge

diff --cc test/pager1.test
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal.test
Simple merge

diff --cc test/wal2.test
Simple merge