Pull all the latest trunk changes into the apple-osx branch.

FossilOrigin-Name: 4eaef4ad4cfda519f18922a249904d16489ee606

diff --cc manifest
index 7f70b738a9f4f975338cd9024f177c78cfff1777,36e2f96988d284349b209029a9f3602e0088945d..3ae4d8fd3c0334dc2bbbf1f9cf45831f72fb1709
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2011-04-05T22:10:50.553
 -C Remove\san\salways-true\sconditional.\s\sReplace\sit\swith\san\sassert().
 -D 2011-04-09T17:53:30.201
++C Pull\sall\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-04-09T18:13:35.023
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 +F Makefile.in 46b5d5017359f89b1aa89ca3581d6ec577738d96
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -141,15 -138,15 +141,15 @@@ F src/global.c 02335177cf6946fe5525c6f0
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 6873a0b359e538d0568a8b459ca630edef8dde2c
+ F src/insert.c acfb89fe4a73d703e425e167bfcc72985f4299ae
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
- F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
- F src/main.c 7ca36457dd485f8e90d79524cc443a0d828981f8
+ F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
 -F src/main.c a8571665d43ff18f89a49d47a281605ce5ea825e
++F src/main.c 3f1e9329c1e689375adf143d4303077d4c14aade
  F src/malloc.c 788f2ed928786dfe305b6783d551d6b1a9080976
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 +F src/mem1.c 46095d62b241466ef51970e592aa3a7a87e443e1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -165,7 -162,7 +165,7 @@@ F src/os.c 22ac61d06e72a0dac90040014733
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 2596fd2d5d0976c6c0c628d0c3c7c4e7a724f4cf
- F src/os_unix.c 4cef66b6bc496323b1a05f23f5ad92e70a0843f2
 -F src/os_unix.c a8fe62148d41e54e383d3360a711a01595feef58
++F src/os_unix.c a3688d61edd94f4756fc86185702e2bf3903be6a
  F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
  F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
@@@ -173,19 -170,18 +173,19 @@@ F src/parse.y 12b7ebd61ea54f0e1b1083ff6
  F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c d548e31beafa792d1994b663a29a5303569efc4e
 -F src/pragma.c 49c90ab27a4339d4b5bc0b03c08cbcf20ed8d454
 -F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
 +F src/pragma.c 1785e42ea5242aa47cbb7e73aad242d8a4198142
- F src/prepare.c f68146dd11f512d26d555d669b703476312667fd
++F src/prepare.c 9d7403fe75fefa134351b41400d09ba1b189134b
  F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
- F src/shell.c a73b30067ec15f116d5d0c28880179898fbe3d0b
- F src/sqlite.h.in 923630d8249b66cf8a266dd53d4d094cace80164
+ F src/select.c 649a6f10f7eb7b52a5a28847773cb9968a828ae8
+ F src/shell.c 9c8389796764f65d4506bcd614ac8061f4160d5c
+ F src/sqlite.h.in 4d28db70c37a1b17942820308eb59f211140da43
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 7b0150bfdab049b11bb2d055d065051ff734d113
- F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
+ F src/sqliteInt.h ac8f3f5846275c634f6649969304a9e97f6f9854
+ F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
@@@ -200,9 -196,9 +200,9 @@@ F src/test8.c 6b1d12912a04fe6fca8c45bb9
  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 d0711ab7576f65704c53c76ceb18c0e90c03e0f8
 -F src/test_config.c d536042f27226b4639f0f87d4795fd37428a9ddf
++F src/test_config.c 06c91d432a0ecca3c0ff291d16472f74458f74ce
  F src/test_demovfs.c 31050680fa6925b4f677cfd4fa965b5f19195e50
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -239,14 -235,14 +239,14 @@@ F src/update.c 81911be16ece3c3e7716aa18
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c ccedf7f22d99447172c55065d053eaa64c180cb5
 -F src/vdbe.c 05deeec6659f2579674a5e6510b3ada2a442f8d5
++F src/vdbe.c 4a1b6078e0a38106ab022f764ed285dc03450d15
  F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
- F src/vdbeInt.h 53dfcaf5b83297c24f537c4a54c1f35fd655b0a2
+ F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae
 -F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
 +F src/vdbeapi.c 34b6686d9079264bc715f63e41bc2f0d9b98de89
- F src/vdbeaux.c 3170e917af38835621deddee560e53e188147f5b
+ F src/vdbeaux.c 9ae5074b19bdff2d8806a278533956fb281510d5
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
- F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
+ F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c b0abc931f95af94c9ffdf9f747eb191cda953123
  F src/wal.c 7334009b396285b658a95a3b6bc6d2b016a1f794
  F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
@@@ -272,9 -268,10 +272,10 @@@ F test/async2.test bf5e2ca2c96763b4cba3
  F test/async3.test 93edaa9122f498e56ea98c36c72abc407f4fb11e
  F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
  F test/async5.test f3592d79c84d6e83a5f50d3fd500445f7d97dfdf
 -F test/attach.test 2bb09073d7d5499127db00f50780766dcea913e1
 +F test/attach.test e26b6c050d5b2ba0064288137bdd325370c11e65
  F test/attach2.test a295d2d7061adcee5884ef4a93c7c96a82765437
  F test/attach3.test bd9830bc3a0d22ed1310c9bff6896927937017dc
+ F test/attach4.test 31f9eb0ca7bdbc393cc4657b877903a226a83d4b
  F test/attachmalloc.test 1d5b821a676f7bf0b00d87cc106b78966789ba57
  F test/auth.test b047105c32da7db70b842fd24056723125ecc2ff
  F test/auth2.test 270baddc8b9c273682760cffba6739d907bd2882
@@@ -388,11 -385,12 +389,12 @@@ F test/enc3.test 5c550d59ff31dccdba5d1a
  F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de
  F test/eqp.test f14fadd76da53405e9885e2431cacf7191d83cdb
  F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 -F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062
 +F test/exclusive.test 897074dc6706b0c4f3b1dc4580ffddffe2a79206
  F test/exclusive2.test 343d55130c12c67b8bf10407acec043a6c26c86b
  F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
+ F test/exists.test 81363f6982ea49dfd820a50845466390e60a4a0c
  F test/expr.test 19e8ac40313e2282a47b586d11c4892040990d3a
 -F test/fallocate.test 43dc34b8c24be6baffadc3b4401ee15710ce83c6
 +F test/fallocate.test a9927b638567e2e776c112f54d701402a0e74023
  F test/filectrl.test 97003734290887566e01dded09dc9e99cb937e9e
  F test/filefmt.test f178cfc29501a14565954c961b226e61877dd32c
  F test/fkey1.test 01c7de578e11747e720c2d9aeef27f239853c4da
@@@ -865,10 -861,10 +866,10 @@@ F test/vtabE.test 7c4693638d7797ce2eda1
  F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
  F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
  F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
- F test/wal.test d5754f56e92770d9d62f4d469475cef6a8bd73f3
 -F test/wal.test 5617ad308bfdb8a8885220d8a261a6096a8d7e57
 -F test/wal2.test e561a8c6fdd1c2cd1876f3e39757934e7b7361f8
 -F test/wal3.test 5c396cc22497244d627306f4c1d360167353f8dd
 -F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
++F test/wal.test 3ff610479cd005117f54a8c003a8d86432e6f2ac
 +F test/wal2.test 885142e522e94e2955b426dae392a1b56c101063
 +F test/wal3.test 34c65b1cb78e1da5d24c9ab74534c376784f96ea
 +F test/wal4.test 6a68c45bc1ca24a3592ec449ddcb92b29d0e0e87
  F test/wal5.test 1bbfaa316dc2a1d0d1fac3f4500c38a90055a41b
  F test/wal6.test 07aa31ca8892d0527f2c5c5a9a2a87aa421dfaa8
  F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
@@@ -907,10 -903,10 +908,10 @@@ F tool/lempar.c 01ca97f87610d1dac6d8cd9
  F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 -F tool/mksqlite3c.tcl 623e26cc8c83322e4151d3ad85ac69d41221bae8
 +F tool/mksqlite3c.tcl 98afd75c54489dd27b505fca45e3cc6943cb2409
  F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
  F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
- F tool/omittest.tcl 4f4cc66bb7ca6a5b8f61ee37b6333f60fb8a746a
+ F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
  F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
  F tool/shell1.test f608a009b04c490fd360c5ded458a6f98b4e7ec4
@@@ -931,7 -927,7 +932,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 8e885ddea0fc5d4c4256025c127e5d41d63c47a5 3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
- R 881999fa54315f16db82b97a9c6102de
 -P a46f32900a013aa6bb2dad2a9ed3ce00ab2493fd
 -R 82deaf50c44bacb7e77b8358435cc0c9
++P c77a767cbd22354d9f6d5cef0d81ea721be593c7 1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff
++R e20e75aa5191eab7b4e694fd1a5ff7c8
  U drh
- Z ed63900d29a0b33e17925a21ad13e782
 -Z 1d377ca5bb92e1cc67ae34d0dbcea9e6
++Z 9c479e9fb921fabf05fda709cef5ba76

diff --cc manifest.uuid
index 25d7e98e4fd34ada97d5edda4c7274be6d9ba5d7,e9b55b99fe2d3f7862d8ab6bbd9c15b4e0001130..2e38ab667ffda6d6158c14a166fc05c2e895e2ec
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c77a767cbd22354d9f6d5cef0d81ea721be593c7
 -1c2f0f8477bcf251fe874a2cfae4d7a403cb88ff
++4eaef4ad4cfda519f18922a249904d16489ee606

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/prepare.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/wal.test
Simple merge