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

FossilOrigin-Name: 76005fdca05d86f91e424698d86942264419c616

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

diff --cc manifest
index 5920d3a684d7a50011421d717979fffceb2d0e9c,42f907d912b148b5e839c000a8e92c3727a0b26d..ce58bd969fe5b9f79934349781c9a47e2ab5b415
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
 -C More\stypo\sfixes\sin\sevidence\smarks.\s\sNo\scode\schanges.
 -D 2011-06-20T23:51:33.581
 +C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2011-06-20T11:57:58.568
++D 2011-06-21T01:30:53.231
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 +F Makefile.in 8410b02448997eb43bdf0ffa482c9bc2d2624e45
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc ce73810c83d4bd202deb59d547a5df4a5cfef7c9
+ F Makefile.msc c942f2ceb9385d6c75b01ee3d38d8a189fb76e8c
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 3fcdd7fbe3eb282df3978fe77288544543767961
@@@ -84,7 -84,7 +84,7 @@@ F ext/icu/README.txt bf8461d8cdc6b8f514
  F ext/icu/icu.c eb9ae1d79046bd7871aa97ee6da51eb770134b5a
  F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
- F ext/rtree/rtree.c bd21acadc01a378ac9370d28be7dfd8de857654c
 -F ext/rtree/rtree.c b431c54d1ed05f04f2987e8a4fbb931acb40c312
++F ext/rtree/rtree.c c64b78b1995fdbde9af7d2b910f8c9d9d908f583
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -168,8 -165,8 +168,8 @@@ F src/os.c 22ac61d06e72a0dac90040014733
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c 56c56d4c204de5ab875a23db975a79b8576b5cdb
- F src/os_win.c 218b899469e570d46eb8147c2383075f7c026230
 -F src/os_unix.c 07acbb3e074e52b48a4248c06f66c9a91db1a0ce
++F src/os_unix.c aeef5f00753ee92478ae1d6c0c92b1aee26691c5
+ F src/os_win.c eafcd6b91cf204a7ef29ac1ef2a1b7132e132e58
  F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@@ -184,15 -181,14 +184,15 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1
- F src/sqlite.h.in 2f51e4f58b2b4626fcbd9938580e730cb5fb4985
+ F src/sqlite.h.in a4d0baabe4f86b3ab9cf56eda23dfd9d022ece0a
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
  F src/sqliteInt.h 7b7ec2394b94fc4516930cd9dae37af0f9312215
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c c124d55e3e7d156c0fcc62c7f9906de8451547dc
+ F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef
 -F src/test1.c efca486a25fb894988e7a82e84579a4e57388a02
 +F src/test1.c 5c8be86cba3ac703c765730b7dd1ec62bf84e750
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -203,9 -199,9 +203,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 308a99163bd821efa84f0ada99bc61fbbf44b613
 -F src/test_config.c 791a9acbf9a695cf9c12ff6bbe874dfde9a8c5f3
++F src/test_config.c a7e692af95c211b29bd6a6c4b3dfe0a2a8f808a7
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -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 71a3e14a5dd6bafac3940c6eb446cd97dcbae34c
 -F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f
++F src/vdbe.c 80d511d7096918f4f6be6a63988a885c54dd1048
  F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
  F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 0eeadc75e44a30efd996d6af6e7c5a2488e35be8
 +F src/vdbeapi.c d2ce598db7398acb82d65e99e7a917d5318dc702
  F src/vdbeaux.c 0b2e2880f13af400a27c92a7673287c3eaec8b21
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
@@@ -391,10 -387,10 +391,10 @@@ F test/e_vacuum.test 6c09c2af7f2f140518
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
  F test/enc2.test 6d91a5286f59add0cfcbb2d0da913b76f2242398
  F test/enc3.test 5c550d59ff31dccdba5d1a02ae11c7047d77c041
- F test/enc4.test 4b575ef09e0eff896e73bd24076f96c2aa6a42de
+ F test/enc4.test b145fa25feb56ea1d51a5bc43ca268c0cf691a67
  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 5e2d64b4eb5a9d08876599bdae2e1213d2d12e2a
@@@ -697,10 -692,10 +697,10 @@@ F test/sysfault.test c79441d88d23696fbe
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl fa977567000000b49cbef700c07199df28fc7b8a
 -F test/tester.tcl 78e63a11eaaec5c2b3c74977d61bf70666d8393f
++F test/tester.tcl 54a2028984500c76dcfbef6e927ef23ef1141515
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -924,7 -919,7 +924,7 @@@ F tool/lempar.c 01ca97f87610d1dac6d8cd9
  F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c.tcl 1db8ff5115862cd926234afafe15da2adc8544c5
 -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
@@@ -951,7 -946,7 +951,7 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P ce5f95dee6989f17a6a7af89699a02f8c5c6f787 e539d08a4dda073dc67dc39a104f89374d3bd8e9
- R fc5e80466e6b0dc7c5d050e3640a2348
 -P bd980be471b185e2dc45875804103d5afc8f78cf
 -R 129d3396a51cd277a2cd5fd90ed058d9
++P 4c69e827f4d65e597e125e0d6691b0c8fb5588d7 e60eefc76fa5066720d76858f6cfca56365330ee
++R 57a0e9a4fabd4995959d9cd71e887832
  U drh
- Z e118c565ba7861eece38b3234e70a076
 -Z c467af82d7eff2f784ff6186e148e641
++Z 5c6f3f32328535fdb642daa473cdb5a8

diff --cc manifest.uuid
index 6d381c1e2d5273abc7d66c3a23729ac1b31bb094,df26e532319ddef943de0a26f823ce87cab7d2c7..ad13351b32f6da694fe9bbf3d24e2bc25cc7364d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4c69e827f4d65e597e125e0d6691b0c8fb5588d7
 -e60eefc76fa5066720d76858f6cfca56365330ee
++76005fdca05d86f91e424698d86942264419c616

diff --cc src/os_unix.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge