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

FossilOrigin-Name: c77a767cbd22354d9f6d5cef0d81ea721be593c7

diff --cc ext/rtree/rtree.c
Simple merge

diff --cc manifest
index 82bfe53cc08eb3623493d9aacfe62b7bd22baeda,ffd971b88a04b6fb1206a531c13a9fae5d05586a..7f70b738a9f4f975338cd9024f177c78cfff1777
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Pull\sthe\slatest\schanges\sfrom\strunk\s(and\shence\sfrom\sschema-parse-refactor)\ninto\sthe\sapple-osx\sbranch.
- D 2011-04-05T13:38:12.837
 -C Suppress\smany\sharmless\scompiler\swarnings,\smostly\ssigned/unsigned\scomparisons\s\nwithin\sasserts\sor\sunused\sparameters\sin\sextensions.
 -D 2011-04-05T22:08:24.148
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-04-05T22:10:50.553
  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
@@@ -78,10 -78,10 +78,10 @@@ F ext/fts3/fts3_write.c 813495ed106eb94
  F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
  F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
  F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
- F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2
+ F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c 155c420fe9bdfec3e1e974cc1f5fe03cb47208b5
 -F ext/rtree/rtree.c f5fa951eba03c41d292958064604a033021acdee
++F ext/rtree/rtree.c b159d6a5312df5698ad5274ed374e55815fd6c50
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test dbd4250ac0ad367a262eb9676f7e3080b0368206
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -143,16 -140,16 +143,16 @@@ F src/hash.h 2894c932d84d9f892d4b4023a7
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 6873a0b359e538d0568a8b459ca630edef8dde2c
  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 3ec864034dbc0f91d4403bb1ac0b38fa91825c38
- F src/malloc.c 92d59a007d7a42857d4e9454aa25b6b703286be1
 -F src/main.c 5dad851457fdd249a4d4f41e94fe9cb11aedf1f2
++F src/main.c 7ca36457dd485f8e90d79524cc443a0d828981f8
+ 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 72e0bc40f535ac38a11712aed01d0014f9300732
+ F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
  F src/memjournal.c 0ebce851677a7ac035ba1512a7e65851b34530c6
  F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f
  F src/mutex.h fe2ef5e1c4dae531d5a544f9241f19c56d26803d
@@@ -165,9 -162,9 +165,9 @@@ 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 32414676594a0a26cfccd7e02656230a3406eee7
 +F src/os_unix.c 4cef66b6bc496323b1a05f23f5ad92e70a0843f2
  F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
- F src/pager.c 6aa906b60a59664ba58d3f746164bb010d407ce1
+ F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
@@@ -180,9 -177,8 +180,9 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d24406c45dd2442eb2eeaac413439066b149c944
- F src/shell.c 9dc0b4bb59290c0a35256d278cab0f314987ad6a
- F src/sqlite.h.in e047f69a61d604d4f8be6cf1d1bdfc68be9ba7e5
+ F src/shell.c a73b30067ec15f116d5d0c28880179898fbe3d0b
+ F src/sqlite.h.in 923630d8249b66cf8a266dd53d4d094cace80164
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
  F src/sqliteInt.h 7b0150bfdab049b11bb2d055d065051ff734d113
  F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@@ -239,11 -235,11 +239,11 @@@ F src/update.c 81911be16ece3c3e7716aa18
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c cd997077bad039efc0597eb027c929658f93c018
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c f2a706e0df21fc17d314e5262bf950b768128827
 -F src/vdbe.c ee58240a9b352db350d2848212ee9142a821c387
++F src/vdbe.c ccedf7f22d99447172c55065d053eaa64c180cb5
  F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
- F src/vdbeInt.h 7e2f028ecc1a9faa6f253e7aa8d89cae03662bae
- F src/vdbeapi.c bb9859f2c86fea99d06adb54f5e63939d96a36c3
- F src/vdbeaux.c e1ea6edc07b4f33a339cc45a2fbe0a36067d2d8b
+ F src/vdbeInt.h 53dfcaf5b83297c24f537c4a54c1f35fd655b0a2
 -F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
++F src/vdbeapi.c 34b6686d9079264bc715f63e41bc2f0d9b98de89
+ F src/vdbeaux.c 3170e917af38835621deddee560e53e188147f5b
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 3ba13bc32bdf16d2bdea523245fd16736bed67b5
@@@ -865,10 -860,10 +865,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 f30615b9c00ba6cd5741db7c17836c2c3785b8ce
 -F test/wal.test 084b086913a205eab4dde4b9a9cf8c781a576bb8
 -F test/wal2.test e561a8c6fdd1c2cd1876f3e39757934e7b7361f8
 -F test/wal3.test 5c396cc22497244d627306f4c1d360167353f8dd
 -F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
++F test/wal.test d5754f56e92770d9d62f4d469475cef6a8bd73f3
 +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
@@@ -931,7 -926,7 +931,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6d78a25ddce75f63581be60c34dbc75f34c243df 5db4511d8a77b74be3503a7c34257ef6b07541f5
- R c0c0392912af2a8f45751ee4305063cf
 -P 51039b3578f948c23a810d176e81fa51a278fb28
 -R 18530986ff3caac2d2c1acc5867b1dce
++P 8e885ddea0fc5d4c4256025c127e5d41d63c47a5 3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
++R 881999fa54315f16db82b97a9c6102de
  U drh
- Z 44c218f72ac573e478e393cb868e8968
 -Z 767e18c513ceaeb424f39c58cb8c31a7
++Z ed63900d29a0b33e17925a21ad13e782

diff --cc manifest.uuid
index 1452c7c4edc762230b92a59260ca08335d15edd5,f64fd90592e493863343e2be04a9c317d74929ee..25d7e98e4fd34ada97d5edda4c7274be6d9ba5d7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8e885ddea0fc5d4c4256025c127e5d41d63c47a5
 -3eeb0ff78d04891b5fd1a3d99a9fb8cfbed77a81
++c77a767cbd22354d9f6d5cef0d81ea721be593c7

diff --cc src/main.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc test/wal.test
index e80f02131b2de87817188ab56944bb263d145d7e,ff88f314d20fcd19e06a2ece86fe07444cf29593..6ab02034a7c762c48391578884d7f113772e84ec
--- 1/test/wal.test
--- 2/test/wal.test
+++ b/test/wal.test
@@@ -19,11 -19,9 +19,13 @@@ source $testdir/lock_common.tc
  source $testdir/malloc_common.tcl
  source $testdir/wal_common.tcl
  
+ set testprefix wal
+ 
  ifcapable !wal {finish_test ; return }
 +if { ![wal_is_ok] } {
 +  finish_test 
 +  return 
 +}
  
  proc reopen_db {} {
    catch { db close }