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

FossilOrigin-Name: 55af80035f0432bbd4c4b3f4dbc9def13c5356b3

diff --cc main.mk
Simple merge

diff --cc manifest
index e31673cb01315a1ca45f8799ef331fc9dce73641,91a0745b81ca68517e86974a4da685708511e355..0f864e3ed4037442d13cd5bf97f8633ffe37f605
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2011-08-23T18:06:05
 -C Update\scompiler\serror\smessage\sregarding\sthe\schoice\sof\smemory\sallocator\sdefines.
 -D 2011-08-26T11:25:02.455
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sapple-osx\sbranch.
++D 2011-08-26T19:18:50.781
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
 +F Makefile.in 6d45d7ea497fd85ae06fd6e742b7cb579a02f732
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 386444f1e1a1536d19a426030d93fd6e03b7d3b5
+ F Makefile.msc 55fe94bf23b4c1ff035f19b0ae2ea486350f8d01
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
@@@ -102,12 -102,9 +102,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 a1e924472da3250e51c177c0e8047b6831385e91
 -F main.mk 201b1d81aa4ac0af21b243151e79477c14ce3722
++F main.mk 5e57a614cd8db5935cdfd0ba6b8dcec37b33ccd0
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -124,13 -121,13 +124,13 @@@ F src/alter.c ac80a0f31189f8b4a524ebf66
  F src/analyze.c a425d62e8fa9ebcb4359ab84ff0c62c6563d2e2a
  F src/attach.c 12c6957996908edc31c96d7c68d4942c2474405f
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
- F src/backup.c 4dfc39043a42cbe47f22b2da47065ae5377f44fd
+ F src/backup.c 28a4fe55327ff708bfaf9d4326d02686f7a553c3
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 51e4af60aa467d6a78b39346986cd607fe5d29c1
- F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
 -F src/btree.c ed13fdefdbe671d5777773dcfb3a162ddb4623ae
++F src/btree.c a10d12745f395ca313e62b455b687db987260a7e
+ F src/btree.h 9ddf04226eac592d4cc3709c5a8b33b2351ff5f7
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c 6c60478a1e23f7cdd30ae0251b46f9adbe0e98c2
+ F src/build.c 2d5de52df616a3bf5a659cbca85211c46e2ba9bd
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c caf51429be3e0d4114056a8273b0fff812ff8ae9
@@@ -146,13 -143,13 +146,13 @@@ F src/hash.h 2894c932d84d9f892d4b4023a7
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  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 99a161b27a499fc8ad40745b7b1900a26f0a5f51
- F src/main.c a5414c66da45e65518e9f84e9cfe4ac1ff30ea06
 -F src/main.c 43664b68a0b0f8fe9edc7d987b42cb8e26298468
++F src/main.c 242eaa584e256364f81f2aef97d3eca283d94073
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 -F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
 +F src/mem1.c 46095d62b241466ef51970e592aa3a7a87e443e1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
  F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
  F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
@@@ -168,26 -165,25 +168,26 @@@ F src/os.c af614089eb9328f3a6a8374d2e4c
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h 65a897143b64667d23ed329a7984b9b405accb58
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c bcdfbf4f5580ee9224155f5140cdf2d03c03048e
- F src/os_win.c 4eb6fa00ee28f6d7bad0526edcbe5a60d297c67a
- F src/pager.c e3688b37e781e8e069ed6375299da82a34a41794
- F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 -F src/os_unix.c 1a34ca3794ced80e4a4ebcc3ba1f4c516762e534
++F src/os_unix.c 0cac72a676f4df029fc9fffd1223d6bf307e02c6
+ F src/os_win.c 86bcb5bd0386c761c764c3383879469346da3a14
 -F src/pager.c 817f7f7140c9fa2641f28e6330e924708ddd870d
++F src/pager.c 382b3dd2b5c39691f5545454287c232d196c2353
+ F src/pager.h 2bab1b2ea4eac58663b5833e3522e36b5ff63447
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
- F src/pcache1.c a1d860753eee0a46165afaad3962a88463fb32a8
+ F src/pcache1.c c8982f7048a70b7fd37975a8f6c84d6bc294175a
 -F src/pragma.c ebcd20f1e654f5cb3aeef864ed69c4697719fbaa
 -F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
 +F src/pragma.c 66661dbe8428dd3215bd4c8f8a43dd3326e0bf6f
 +F src/prepare.c 9d7403fe75fefa134351b41400d09ba1b189134b
  F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 -F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d
 +F src/select.c 015f2371832c921254220f9f15568f66601935f6
  F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
- F src/sqlite.h.in 4f475c9bcbf8dcee7b7714cff2b339fe538a005d
 -F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
++F src/sqlite.h.in 175065018323ca082092f92873e074647d00bec2
 +F src/sqlite3_private.h 1d18557420cb0cc51ff31ec0a3fcce11e5cd6f5a
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
- F src/sqliteInt.h 5c29fe37ecd1b105fba48956855e23798477d266
 -F src/sqliteInt.h 86a4fdb3ba9ab31d98b266797606f30fefe5b8a9
++F src/sqliteInt.h 1bcfb53f94421a44d606d540d635889fe2fa1095
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -223,15 -219,15 +223,15 @@@ F src/test_mutex.c a6bd7b9cf6e19d989e31
  F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
  F src/test_osinst.c 62b0b8ef21ce754cc94e17bb42377ed8795dba32
  F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
- F src/test_quota.c cc4f67e12558a252ea4a11720be268348f4b1595
- F src/test_rtree.c af76d5a2ead69280ba33d318263167ad9e674bb0
+ F src/test_quota.c a391c866217e92986c6f523f05b08aa6956c8419
 -F src/test_rtree.c 6d06306e29946dc36f528a3a2cdc3add794656f1
++F src/test_rtree.c a2eebb68c0f1463918cdfbe603cb2e869c551038
  F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
  F src/test_server.c 2f99eb2837dfa06a4aacf24af24c6affdf66a84f
  F src/test_stat.c f682704b5d1ba8e1d4e7e882a6d7922e2dcf066c
 -F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
 +F src/test_superlock.c 12e2bc484c6c2ba837327d37f2e6a6fd9d1464f8
  F src/test_syscall.c a992d8c80ea91fbf21fb2dd570db40e77dd7e6ae
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
- F src/test_thread.c fe9a7803fc1d69cccb60f016f28c1cedf2d9fcfa
+ F src/test_thread.c dc77f920d24f2f515bd315b87942b6396332a414
  F src/test_vfs.c b0baec983bd6f872715a4b44c8f39104fec333af
  F src/test_vfstrace.c 0b884e06094a746da729119a2cabdc7aa790063d
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
@@@ -242,18 -238,18 +242,18 @@@ F src/update.c 74a6cfb34e9732c1e2a86278
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c 859006c0171c04f3215be1b45ba05add580e4b60
- F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
 -F src/vdbe.c 4a7191c0f8e918b74e8c84cbdd77746d6b7e3bcf
++F src/vdbe.c 0d70d10e2e1ab0c2b9287c9d43e25c1c9c8c74ff
+ F src/vdbe.h 2bf6ec77d8b9980fc19da6e0b0a36d0dbf884ce4
  F src/vdbeInt.h f9250326f264ca5f100acc19e9c07096bb889096
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 +F src/vdbeapi.c 335435e65443f38d3073b5043e80cbbb7090c2d9
- F src/vdbeaux.c 8fb978eb73a97b34d352dd3ef3bff35b1b3fa7e9
+ F src/vdbeaux.c 11b0df8822ecf61e543562247207df75e2ebb617
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
- F src/vdbesort.c a63bab05465ef7f8d28d46757eef55f84828d9a7
+ F src/vdbesort.c 8a61a6d731cbe612217edf9eece6197f37c9489e
 -F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
 +F src/vdbetrace.c 4b92fe7355f682368203d29b2be7125cbab85e79
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
 -F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
 -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
 +F src/wal.c 92c7c876b026d5e38fab3ce332e49266ffcf8b2b
 +F src/wal.h e75d87752bd5df3dc4152ee2cb3b0dcd0b309e5e
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c 7d09f4c1512affb60cc1190a4b33d121d4ce039a
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
@@@ -614,10 -609,10 +614,10 @@@ F test/notnull.test cc7c78340328e6112a1
  F test/null.test a8b09b8ed87852742343b33441a9240022108993
  F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
  F test/oserror.test 3fe52e0bd2891a9bf7cdeb639554992453d46301
- F test/pager1.test abddd000fa8e92fcdf2ad93fa612da3893bfe018
 -F test/pager1.test 70c94c895ffaf4dc34ee4b66e6e4cd713af41edc
++F test/pager1.test 21ec8ef96675aaa7839a0a474ab965d8d5c084fa
  F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
  F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 -F test/pagerfault.test 452f2cc23e3bfcfa935f4442aec1da4fe1dc0442
 +F test/pagerfault.test a15ef77c8495882d7debb43794e87b6e46174c8a
  F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
  F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
  F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
@@@ -965,8 -960,8 +965,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P 77376b332b4460208f837f7bdf6df8c90d5071d5 fac8bc8f3450a6ce74c9250acb0608e940ffb54d
- R b3e8eaa8b0449f30ab4acaa54eec2531
- U dan
- Z cf2e3b8c5c529959da791d3809d937e6
+ F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
 -P 5238a74987507f27af4080e2842f53e049b5b111
 -R 68d004e4a18ddd9b15416c3d56993539
 -U mistachkin
 -Z cf5bdd8db49b4512fd908f85b844bfec
++P c5f7977b899e93bf90bd44572db78c744ea81c14 1dada5158215d1816edb69ff2610f9d2259ce19d
++R 3147a883ff036dd2141aa0af7e683788
++U drh
++Z 6674d35387f1443e6be9c6f9a17a5217

diff --cc manifest.uuid
index 5e4548f0d8912bcaf8bc56e5e147be6915c40b9c,3413c7f0936ebe41a6acbedc4cbddb990f3cca5a..68d4c453f44d5b99b6fea7867b1f37d73db09fbd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- c5f7977b899e93bf90bd44572db78c744ea81c14
 -1dada5158215d1816edb69ff2610f9d2259ce19d
++55af80035f0432bbd4c4b3f4dbc9def13c5356b3

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
index 07069c46a50176a82981963a2f196d2644b33612,868e029f8275cf058a093ee145781efcae8b7e66..f8a471c063e8b7087dd5ddef54568642057c5e9f
--- 1/src/os_unix.c
--- 2/src/os_unix.c
+++ b/src/os_unix.c
@@@ -3731,17 -3353,11 +3735,19 @@@ static int unixSync(sqlite3_file *id, i
      rc = osOpenDirectory(pFile->zPath, &dirfd);
      if( rc==SQLITE_OK && dirfd>=0 ){
        full_fsync(dirfd, 0, 0);
 +#if OSCLOSE_CHECK_CLOSE_IOERR
 +      if( close(pFile->dirfd) ){
 +        pFile->lastErrno = errno;
 +        rc = SQLITE_IOERR_DIR_CLOSE;
 +      }
 +#else
        robust_close(pFile, dirfd, __LINE__);
 +#endif
+     }else if( rc==SQLITE_CANTOPEN ){
+       rc = SQLITE_OK;
      }
      pFile->ctrlFlags &= ~UNIXFILE_DIRSYNC;
 +
    }
    return rc;
  }
@@@ -5893,13 -5186,9 +5899,15 @@@ static int unixDelete
        {
          rc = unixLogError(SQLITE_IOERR_DIR_FSYNC, "fsync", zPath);
        }
 +#if OSCLOSE_CHECK_CLOSE_IOERR
 +      if( close(fd)&&!rc ){
 +        rc = SQLITE_IOERR_DIR_CLOSE;
 +      }
 +#else
        robust_close(0, fd, __LINE__);
 +#endif
+     }else if( rc==SQLITE_CANTOPEN ){
+       rc = SQLITE_OK;
      }
    }
  #endif

diff --cc src/pager.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_rtree.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/pager1.test
Simple merge