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

FossilOrigin-Name: f9b149e53815235aaf92f722e37c4819503d72b3

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

diff --cc main.mk
Simple merge

diff --cc manifest
index 396e4b5d89f1556aa09e28b923c54ff48f487efa,edcbb7b26a8984a455441880afd265a2d4dec2cd..dcadcba214056fb7aef8ec72facd0960ef5eb02f
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Update\sthe\sapple-osx\sbranch\sto\sversion\s3.7.6.1.
- D 2011-04-13T15:42:26.541
 -C Bump\sthe\sversion\snumber\sto\s3.7.7\son\saccount\sof\sthe\snew\ssqlite3_vtab_config()\nand\ssqlite3_vtab_on_conflict()\sinterfaces.\s\sUpdates\sto\sthe\sdocumentation\son\nthose\sinterfaces.
 -D 2011-05-05T15:39:50.869
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-05-05T15:52:46.864
  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
@@@ -81,9 -82,9 +82,9 @@@ 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 b159d6a5312df5698ad5274ed374e55815fd6c50
 -F ext/rtree/rtree.c 829c6901a2b065ff93a68d431f9eaba8de7128e0
++F ext/rtree/rtree.c 15361dc28c9d5ff7635a382e85a2b7a2c7a124aa
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
- F ext/rtree/rtree1.test dbd4250ac0ad367a262eb9676f7e3080b0368206
+ F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
  F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
  F ext/rtree/rtree4.test 0061e6f464fd3dc6a79f82454c5a1c3dadbe42af
@@@ -99,12 -100,9 +100,12 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730
 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41
 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 31aab5c567b3426ffecfa57e50937608deeec5c9
 -F main.mk 496cec8b7890e39127532294e28e5e1d1b1beae1
++F main.mk 93d79977abc0bcbb431c84a13a64322edf620fd5
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -136,20 -134,20 +137,20 @@@ F src/delete.c 7a24fcc9a31664d145acb97c
  F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
- F src/func.c b6f0b8433b0eaed5d09102863940c1660223b468
 -F src/func.c b9117e40975245b8504cf3625d7e321d8d4b63dc
++F src/func.c c02fda657f2366c493198c3e480695fc69972c5f
  F src/global.c 02335177cf6946fe5525c6f0755cf181140debf3
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c acfb89fe4a73d703e425e167bfcc72985f4299ae
+ F src/insert.c 3eea5a53d2644116fb865afaa4699fabe62b441c
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 -F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 +F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
 -F src/main.c a8571665d43ff18f89a49d47a281605ce5ea825e
 +F src/main.c 3f1e9329c1e689375adf143d4303077d4c14aade
- F src/malloc.c 788f2ed928786dfe305b6783d551d6b1a9080976
+ F src/malloc.c 74c740e8ba22b806cfb980c8c0ddea1cbd54a20e
  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,8 -163,8 +166,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 b90124c1c4e3c64c80a42b8f320867a173bb108f
- F src/os_win.c 24d72407a90551969744cf9bcbb1b4c72c5fa845
 -F src/os_unix.c 2c67d126874b78eb427371db4793f0e8fbc7448b
++F src/os_unix.c b206f9d56b6e3021f195914b63f394d28f23e1cd
+ F src/os_win.c 4271f0bf733c0b45635ddcfb41c935573de8284c
  F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@@ -179,17 -177,16 +180,17 @@@ F src/printf.c 585a36b6a963df832cfb6950
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c 649a6f10f7eb7b52a5a28847773cb9968a828ae8
+ F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
- F src/sqlite.h.in 4d28db70c37a1b17942820308eb59f211140da43
+ F src/sqlite.h.in 9bf19a5dcf6317b0f091c255edaed0b1fc01dcd0
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h ac8f3f5846275c634f6649969304a9e97f6f9854
+ F src/sqliteInt.h e70a03bb66d209e279b3edeb57d4fdc42a1d9fda
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
- F src/test1.c 23a02a6201d2799e2727ce40d93aa04d87fb09e2
 -F src/test1.c e0e4af306b678da05334c2ccaf0377ae8f06e911
++F src/test1.c 89bc831e1d3ecae3d17eac49e9f59e5f84f6f66b
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -200,10 -197,10 +201,10 @@@ 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 d536042f27226b4639f0f87d4795fd37428a9ddf
 +F src/test_config.c 06c91d432a0ecca3c0ff291d16472f74458f74ce
- F src/test_demovfs.c 31050680fa6925b4f677cfd4fa965b5f19195e50
+ F src/test_demovfs.c 938d0f595f8bd310076e1c06cf7885a01ce7ce01
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
  F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
@@@ -239,11 -236,11 +240,11 @@@ F src/update.c 5bcb56e5c7380a2eecb0e718
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c 465fe10aabf0ca7d7826a156dab919b0b65c525a
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c 4a1b6078e0a38106ab022f764ed285dc03450d15
 -F src/vdbe.c 672ec2f41b95a6f35b5bbfe555689457dea4789e
++F src/vdbe.c bf969a63096ebf3209963ddf76e085f5465a7dae
  F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
  F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae
 -F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
 +F src/vdbeapi.c 34b6686d9079264bc715f63e41bc2f0d9b98de89
- F src/vdbeaux.c 9ae5074b19bdff2d8806a278533956fb281510d5
+ F src/vdbeaux.c 25aa5ba7d46b4fe7c8f33dc132d474242d5f9726
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -688,10 -686,10 +691,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 884c1252d6f1a5890048806a07a639d9f2cc79e5
 -F test/tester.tcl d5139260aadd64f318ecbcf982316d5bbc254b1b
++F test/tester.tcl 7fb83d5dd1eff130a0a020d1746f1ccd723c414b
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -867,10 -865,10 +870,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 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 885142e522e94e2955b426dae392a1b56c101063
++F test/wal2.test 24239bb8cd8ca5e47c9ab4ac705f7343d2f9b5a2
 +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
@@@ -934,7 -933,7 +938,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 4eaef4ad4cfda519f18922a249904d16489ee606 a35e83eac7b185f4d363d7fa51677f2fdfa27695
- R f56d4b4086eac34f3512c9e3350ab256
 -P 8485855afc71fb8078d53719c3da75021890ce9e
 -R d001197d2ada5bdc77fdb1803c900b72
++P 289194d68e891e4977407d07e452e48844777a36 930be6a1bdec8c150caafd790973f7a401fc1970
++R f9953bf7534b463a52ab1fb53587971d
  U drh
- Z 835a70d5fe4dfdd93fc163c80d6efff6
 -Z b6f82da815334ecd28dc3bea3383de2d
++Z 363d2e190ed85f758bd8ad149ca95188

diff --cc manifest.uuid
index b829c7cf7a141114b2ad24751b3e5a8fb5579483,a54682b9ba879d6c270542b5d5dc89c409a8bc53..d405da16174508d88412fc7d576340904713e7d3
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 289194d68e891e4977407d07e452e48844777a36
 -930be6a1bdec8c150caafd790973f7a401fc1970
++f9b149e53815235aaf92f722e37c4819503d72b3

diff --cc src/func.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/tester.tcl
Simple merge

diff --cc test/wal2.test
index 9fbe71080ada5bf725428fbc8bb7401da441e77f,97966cd94e7a2fae086e42b57866d83cc25a59c7..d3657dec9bdedf2effcbbf1d49f28e9ba7084a02
--- 1/test/wal2.test
--- 2/test/wal2.test
+++ b/test/wal2.test
@@@ -22,11 -22,19 +22,23 @@@ source $testdir/wal_common.tc
  set testprefix wal2
  
  ifcapable !wal {finish_test ; return }
 +if { ![wal_is_ok] || [path_is_dos "."]} {
 +  finish_test 
 +  return 
 +}
  
+ set sqlite_sync_count 0
+ proc cond_incr_sync_count {adj} {
+   global sqlite_sync_count
+   if {$::tcl_platform(platform) == "windows"} {
+     incr sqlite_sync_count $adj
+   } {
+     ifcapable !dirsync {
+       incr sqlite_sync_count $adj
+     }
+   }
+ }
+ 
  proc set_tvfs_hdr {file args} {
  
    # Set $nHdr to the number of bytes in the wal-index header: