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

FossilOrigin-Name: b5acda0445db39d58229d65a361d539db30f3833

diff --cc manifest
index 4816b491be05bf77c7aaf6c274997933f7f49a50,aaff29d2eb3c48ae42269d7c1895b12ebf59de04..63ace2d527e517bf88edce61d1ce13114cd3f2dc
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Update\sapple-osx\sbranch\swith\sthe\slatest\strunk\schanges.
- D 2011-06-22T11:24:56
 -C Provide\sthe\sSQLITE_MAX_SCHEMA_RETRY\scompile-time\sparameter\sfor\sadjusting\sthe\nnumber\sof\sreparse\sattempts\safter\sa\sschema\schange.
 -D 2011-06-23T01:42:53.188
++C Pull\sthe\slatest\schanges\sfrom\strunk\sinto\sthe\sapple-osx\sbranch.
++D 2011-06-23T02:30:36.446
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 +F Makefile.in 8410b02448997eb43bdf0ffa482c9bc2d2624e45
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 11082f65b452b908d93013292c17850378c39284
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
@@@ -192,7 -188,7 +192,7 @@@ F src/sqliteLimit.h 164b0e6749d31e0daa1
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef
- F src/test1.c 4b3b4e58c3f9457d9e8fb0a6d437215c64287b76
 -F src/test1.c 669b8fde7f3c72250d59fef1adda5e040f7baae0
++F src/test1.c 81c73914d9d2d1fd73bf34cfef0dd3d3f1d4cb38
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -242,10 -238,10 +242,10 @@@ F src/update.c 80d77311d91ebc06b27149e7
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
 -F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f
 +F src/vdbe.c 80d511d7096918f4f6be6a63988a885c54dd1048
  F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
  F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
- F src/vdbeapi.c d2ce598db7398acb82d65e99e7a917d5318dc702
 -F src/vdbeapi.c 2f908c65337b16c6249ab378d477e74492cf759b
++F src/vdbeapi.c 7f01db7d26758b2be316116f8325a0b9f0d8edd6
  F src/vdbeaux.c 0b2e2880f13af400a27c92a7673287c3eaec8b21
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
@@@ -879,11 -874,11 +879,11 @@@ 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 5617ad308bfdb8a8885220d8a261a6096a8d7e57
 -F test/wal2.test aa0fb2314b3235be4503c06873e41ebfc0757782
 -F test/wal3.test 5c396cc22497244d627306f4c1d360167353f8dd
 -F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
 +F test/wal.test 3ff610479cd005117f54a8c003a8d86432e6f2ac
 +F test/wal2.test 24239bb8cd8ca5e47c9ab4ac705f7343d2f9b5a2
 +F test/wal3.test 34c65b1cb78e1da5d24c9ab74534c376784f96ea
 +F test/wal4.test 6a68c45bc1ca24a3592ec449ddcb92b29d0e0e87
- F test/wal5.test 1bbfaa316dc2a1d0d1fac3f4500c38a90055a41b
+ F test/wal5.test f06a0427e06db00347e32eb9fa99d6a5c0f2d088
  F test/wal6.test 07aa31ca8892d0527f2c5c5a9a2a87aa421dfaa8
  F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
  F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
@@@ -925,10 -920,10 +925,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 1fa0ed9cfdc768bf5de7e65fda8d97a46dd2a7e6
 +F tool/mksqlite3c.tcl d99ceeda7010ce4bc47666f51d47edac57f24bb7
  F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
  F tool/mksqlite3internalh.tcl 7b43894e21bcb1bb39e11547ce7e38a063357e87
- F tool/omittest.tcl b1dd290c1596e0f31fd335160a74ec5dfea3df4a
+ F tool/omittest.tcl 8086c014cbae90f1f2b564d59d05a5e4ac1783c9
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
  F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
  F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
@@@ -953,7 -948,7 +953,7 @@@ F tool/symbols.sh bc2a3709940d47c8ac8e0
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 76005fdca05d86f91e424698d86942264419c616 6e1f4df51ad32e36715cba16f9df0d17a08dc653
- R 3fe8d8ccf923ead718e0d406962ef41f
- U dan
- Z 7cc1c43d462645d28cf861dabb055fe3
 -P 07884cc218e6899efd163448ab116f296722f7b8
 -R 1ebb2dce4c03a2b8c248fc12b488baac
++P fb7ad09dec805ccb709b138509d6e1eb77323c2f 8dca748b23fa6f9abf47a186dcd1766f4dcf3ab7
++R 9a5aa13fe4b32880371984e2fbe95a7d
+ U drh
 -Z ee2965e68946933dec7ceb7c99aa065f
++Z 69d0b611617bf66f9b720723d912b28c

diff --cc manifest.uuid
index 9a8b5cfbfd1ebd6952c4bfb7f978a20bb5ea7846,fe91914370471c3ef7a5e839f8b27404fa169e08..04285f73494a65e33d25db06cf33aee5f962a214
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fb7ad09dec805ccb709b138509d6e1eb77323c2f
 -8dca748b23fa6f9abf47a186dcd1766f4dcf3ab7
++b5acda0445db39d58229d65a361d539db30f3833

diff --cc src/test1.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge