Merge the latest trunk changes, including the read-only shared memory

enhancement, into the apple-osx branch.

FossilOrigin-Name: ce5f95dee6989f17a6a7af89699a02f8c5c6f787

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

diff --cc manifest
index 48162ba2498dc306a2dc063c5dd634fd6f86cf4f,f2e67cf931f6f4961645838aa5f635f27f2f1c1a..5ffbe46c6da86780cf5fc01e217362ed43873096
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Pull\sall\sthe\slatest\strunk\schanges,\sand\sespecially\sthe\sfix\sfor\sWAL\scache\nspills\scausing\stransactions\sto\sdisappear,\sinto\sthe\sapple-osx\sbranch.
- D 2011-05-19T01:51:25.453
 -C Merge\sthe\sread-only\sshared\smemory\sbranch\sinto\strunk.\s\sAfter\sthis\smerge,\san\nunprivileged\sprocess\scan\sopen\sWAL-mode\sdatabases\sowned\sby\sanother\suser\sas\nlong\sas\sa\sdatabase\sconnection\swith\swrite\spermission\sexists\son\sthe\sdatabase\nfile\sand\sif\sthe\sreadonly_shm=1\sURI\squery\sparameter\sis\ssupplied.
 -D 2011-06-02T13:04:33.467
++C Merge\sthe\slatest\strunk\schanges,\sincluding\sthe\sread-only\sshared\smemory\nenhancement,\sinto\sthe\sapple-osx\sbranch.
++D 2011-06-02T13:07:43.593
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
 +F Makefile.in a38f09acc876beec6b103a6e12a33795c6b1df9c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -82,7 -82,7 +82,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 d3741cde910b659fd66ca4289eed430e90bdbbb0
 -F ext/rtree/rtree.c 4b8438444927191b55de18e00df43b2e02aacbda
++F ext/rtree/rtree.c bd21acadc01a378ac9370d28be7dfd8de857654c
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 28e1b8da4da98093ce3210187434dd760a8d89d8
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -133,11 -130,11 +133,11 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
  F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
- F src/delete.c 7a24fcc9a31664d145acb97ce56b6d9f249a25e4
- F src/expr.c e3cf0957c6b8faaaf7386a3bc69e53c0dc9705be
+ F src/delete.c cecc926c70783452f3e8eb452c728291ce1a0b21
+ F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c a43ba8a005fb5efd1deeee06853e3a6120d46a91
 -F src/func.c b9117e40975245b8504cf3625d7e321d8d4b63dc
 +F src/func.c c02fda657f2366c493198c3e480695fc69972c5f
  F src/global.c 29bfb85611dd816b04f10fba0ca910366e128d38
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@@ -166,31 -163,30 +166,31 @@@ 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 e911e44f3d4db4b1c10e5152b09888cd2ac961e6
 -F src/os_unix.c fd4e9588ff0ce09720721ce739ab2682202875ae
++F src/os_unix.c 56c56d4c204de5ab875a23db975a79b8576b5cdb
  F src/os_win.c 218b899469e570d46eb8147c2383075f7c026230
- F src/pager.c 4b2358556c88660a94a4560de95dd728911e00fd
+ F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
- F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
+ F src/pcache.c 49e718c095810c6b3334e3a6d89970aceaddefce
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
  F src/pcache1.c d548e31beafa792d1994b663a29a5303569efc4e
 -F src/pragma.c 9e778decc3ee9bcaf88904b4a3b0a4360aaf0eab
 -F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
 +F src/pragma.c 8756649386a4eb7192915fb44e177d30e19f723c
 +F src/prepare.c 9d7403fe75fefa134351b41400d09ba1b189134b
  F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c decd04236a7ef26be5ef46d4ea963044bfad9a48
- F src/sqlite.h.in 8bbf8d9bc5f1a9474a633a2de7014506f1f06b90
+ F src/sqlite.h.in 2f51e4f58b2b4626fcbd9938580e730cb5fb4985
 +F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 771087591052966d36ac1fcd3c8bb7a8c6cf9a38
+ F src/sqliteInt.h 6e58c558c57c8f44011736d5fa5295eb3130f9de
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
- F src/test1.c d98ecaada53b5e4dbf37ea3ba339ac0d0926fda6
 -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
@@@ -201,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 9a6aa8301a56906612b5e70f5b38e80cfb8af8e7
 +F src/test_config.c 308a99163bd821efa84f0ada99bc61fbbf44b613
- F src/test_demovfs.c 938d0f595f8bd310076e1c06cf7885a01ce7ce01
+ F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
  F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
@@@ -240,16 -236,16 +240,16 @@@ F src/update.c 5bcb56e5c7380a2eecb0e718
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c f997c49fa6745bce83e23ae7863a328f8cb9d448
- F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
- F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae
- F src/vdbeapi.c 34b6686d9079264bc715f63e41bc2f0d9b98de89
- F src/vdbeaux.c 535851211df61d83213c83d5ffd3c6ce9ecbdc18
- F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
 -F src/vdbe.c 2ec37637fa70ab0c694d8327ee5dcedbc0621524
++F src/vdbe.c d671bedafc3b09fa3713427a8e3823d05f4d4560
+ F src/vdbe.h d9c6123384189dc37d27beac1bf44688aa75b6cb
+ F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 0eeadc75e44a30efd996d6af6e7c5a2488e35be8
++F src/vdbeapi.c d2ce598db7398acb82d65e99e7a917d5318dc702
+ F src/vdbeaux.c 0505dc4f7ff3cf35e219fe0a20ab798a42772b8b
+ F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
- F src/vtab.c 48dcef8bc757c2e7b488f68b5ddebb1650da2450
- F src/wal.c de27c34c8016c00be348fc6bed588816557ceb66
+ F src/vtab.c 9ba8c7fdb7d39260c033a402f6032d3e7bc5d336
+ F src/wal.c fd63d07233203dd3bd29cbe1ae5c8bb2c34e08fc
  F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c 55403ce19c506be6a321c7f129aff693d6103db5
@@@ -549,13 -545,12 +549,13 @@@ F test/lock.test db74fdf5a73bad29ab3d86
  F test/lock2.test 5242d8ac4e2d59c403aebff606af449b455aceff
  F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
  F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
 -F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
 -F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
 +F test/lock5.test d0d313f059ae5661726d3f197ba6ed8f69257d8e
 +F test/lock6.test 83434ae8ca1d1c5e2eaf74d4e44aa24ab62b291c
  F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
- F test/lock_common.tcl d279887a0ab16cdb6d935c1203e64113c5a000e9
+ F test/lock_common.tcl 0c270b121d40959fa2f3add382200c27045b3d95
 +F test/lock_proxy.test 95be9c32d79be25cf643b4e41a0aa0e53aa21621
  F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 -F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252
 +F test/main.test 753e2b772c041bd8dbd17c7e4132b3981378eaab
  F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
  F test/malloc.test e56c9c3358da2c18385aea15a42dc970913986c2
  F test/malloc3.test 4128b1e6ffa506103b278ad97af89174f310c7ca
@@@ -882,18 -877,19 +882,19 @@@ F test/wal5.test 1bbfaa316dc2a1d0d1fac3
  F test/wal6.test 07aa31ca8892d0527f2c5c5a9a2a87aa421dfaa8
  F test/wal7.test 09bc8de3d11949571d6f7a4188b308059cec27e5
  F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 -F test/walbak.test 4df1c7369da0301caeb9a48fa45997fd592380e4
 -F test/walbig.test e882bc1d014afffbfa2b6ba36e0f07d30a633ad0
 -F test/walcksum.test a37b36375c595e61bdb7e1ec49b5f0979b6fc7ce
 -F test/walcrash.test e763841551d6b23677ccb419797c1589dcbdbaf5
 -F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
 -F test/walfault.test 58fce626359c9376fe35101b5c0f2df8040aa839
 -F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 -F test/walmode.test 22ddccd073c817ac9ead62b88ac446e8dedc7d2c
 +F test/walbak.test 767e1c9e0ea0cfb907873b332883e66e187fa4bc
 +F test/walbig.test 78ac493db2abdb65b9c6cace5b851cc32df1d449
 +F test/walcksum.test cf6787f2ee1a6a3da6f0c2b20b9ede5153e4e03f
 +F test/walcrash.test 80c1cc3173a0ef09d8303fa556cb0187a36d82ea
 +F test/walcrash2.test 929c99d14ee2e3e3ef82585058968a8b12f72706
 +F test/walfault.test 7db81f3dac64ce8897196f199c2909078bcabf8d
 +F test/walhook.test c934ac5219fee2b4e7653d291db9107b8dc73bba
 +F test/walmode.test feb39956ec6f415fbb9dcb12d91243391c2c4715
  F test/walnoshm.test a074428046408f4eb5c6a00e09df8cc97ff93317
 -F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
 -F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 -F test/walthread.test a25a393c068a2b42b44333fa3fdaae9072f1617c
+ F test/walro.test 1f15853383a976ff8bbec78dd44bc15c4e237392
 +F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 +F test/walslow.test 989854bc5c214700a9f2d545bb158643813b8881
 +F test/walthread.test e6e32e93ccebfa401dfc0dd930c79daa3472b0ae
  F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
  F test/where2.test 43d4becaf5a5df854e6c21d624a1cb84c6904554
  F test/where3.test 8e1175c7ef710c70502858fc4fb08d784b3620b9
@@@ -943,7 -939,7 +944,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f9b149e53815235aaf92f722e37c4819503d72b3 67bf1c9a888b0d84d252d6c4c754c2c51994d208
- R 3a925f20d37f60844aff7e1475163b7b
 -P e704e8690ae35decc9769a45cf8d519ccad8b79d 1f930d7e04cd4a5ff3d91a0e9f1b62114f1cebd2
 -R fdd310892b7cea51b352170f4a152593
++P 8d1a6bb002a7817fa7df932f7cab7220c1d62c0e 19084a6641f77a62110b04ea50e298fe132ea784
++R 91418976bd0d542b6389cdb5161ed7c0
  U drh
- Z bf0a7d24e91a5e532c4b622c64110df0
 -Z c21bc600f09ce2bc60c48c66dd9bd252
++Z d68a47cfe5a3ecc44fdc07077d49f5db

diff --cc manifest.uuid
index 880cb5a1ac488611fd2cb7738df3c30f6250eca9,2a33332676e4f3ea56d5faa663b9ffe07f372d6f..ed00324915f7bd4e550a8c98d92ddbb251e6bc88
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 8d1a6bb002a7817fa7df932f7cab7220c1d62c0e
 -19084a6641f77a62110b04ea50e298fe132ea784
++ce5f95dee6989f17a6a7af89699a02f8c5c6f787

diff --cc src/os_unix.c
Simple merge

diff --cc src/test1.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
index 088398679e1290c18ffca025f7e367b2af6fe61e,5923a4c01fbd468a85f98328c94ad756bdbee1d9..656c7a599c23f74614e21c373ffabf7e3f7ae00c
--- 1/src/vdbeapi.c
--- 2/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@@ -107,12 -100,9 +107,12 @@@ int sqlite3_reset(sqlite3_stmt *pStmt)
      rc = SQLITE_OK;
    }else{
      Vdbe *v = (Vdbe*)pStmt;
 +#ifdef SQLITE_ENABLE_SQLRR
 +    SRRecReset(pStmt);
 +#endif
      sqlite3_mutex_enter(v->db->mutex);
      rc = sqlite3VdbeReset(v);
-     sqlite3VdbeMakeReady(v, -1, 0, 0, 0, 0, 0);
+     sqlite3VdbeRewind(v);
      assert( (rc & (v->db->errMask))==rc );
      rc = sqlite3ApiExit(v->db, rc);
      sqlite3_mutex_leave(v->db->mutex);