Bring the apple-wal-readonly branch up to date with the latest changes

in apple-osx, and especially the fix for disappearing WAL transactions.

FossilOrigin-Name: 5791232778c825ec487a06c72b638dcb247cdd58

diff --cc manifest
index 83c2d2e1904605386622f201e0c0648609f130b9,48162ba2498dc306a2dc063c5dd634fd6f86cf4f..e4eba00e6ce63551bde3d78f4531130e7ecc6dbe
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Pull\sin\sthe\spatches\sto\ssupport\sread-only\sWAL\sdatabases\sinto\sa\snew\sbranch\noff\sof\sthe\sapple-osx\sbranch.\s\sThis\salso\spulls\sin\sall\sthe\sother\spending\n3.7.7\schanges\ssuch\sas\sURI\ssupport.
- D 2011-05-12T15:32:51.588
 -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 Bring\sthe\sapple-wal-readonly\sbranch\sup\sto\sdate\swith\sthe\slatest\schanges\nin\sapple-osx,\sand\sespecially\sthe\sfix\sfor\sdisappearing\sWAL\stransactions.
++D 2011-05-19T02:34:30.938
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 46b5d5017359f89b1aa89ca3581d6ec577738d96
+ F Makefile.in a38f09acc876beec6b103a6e12a33795c6b1df9c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
@@@ -125,8 -125,8 +125,8 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 986c15232757f2873dff35ee3b35cbf935fc573c
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 26f8a9d6169413c5682b89b5397d20437b653154
+ F src/btree.c 975ad691a57eb1fb60f1ec76ad0b6571eace62f9
 -F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
 +F src/btree.h d796dc4030b3cce7f5a0cc4f2f986d2befa6b8ac
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
  F src/build.c 0132bc6631fa617a1d28ef805921f6dbac18a514
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
@@@ -147,7 -147,7 +147,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c 015826a958f690302d27e096a68d50b3657e4201
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
  F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
- F src/main.c f50e8d60c6ee3c5c1d450e922edb0b1981b76ae8
 -F src/main.c 1b6edc1d61b466bb273dad8af31e3919aa750726
++F src/main.c 6dc61e8bf59098d1ec49b20760e91539997acaaf
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 46095d62b241466ef51970e592aa3a7a87e443e1
@@@ -166,10 -166,10 +166,10 @@@ 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 dabbe23efc9de8fb30caad63f73c88e10ab0499e
- F src/os_win.c ff0e14615a5086fa5ba6926e4ec0dc9cfb5a1a84
- F src/pager.c 4056376f83f85cea9922a11161087c529e39f7dc
 -F src/os_unix.c e911e44f3d4db4b1c10e5152b09888cd2ac961e6
++F src/os_unix.c d5feb6cbdbbeb1f2d3d8c816dc93da7c408468a8
+ F src/os_win.c 218b899469e570d46eb8147c2383075f7c026230
 -F src/pager.c 4b2358556c88660a94a4560de95dd728911e00fd
 -F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
++F src/pager.c 928d50d35d0167799ac77357e6c4966b3be93f9d
 +F src/pager.h 34c6b029446f06f40847746d22faac0d354dd909
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
  F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
  F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
@@@ -181,16 -181,16 +181,16 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
- F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
- F src/sqlite.h.in adeb2c8019a3851a10e3872f44b34c95c6e409f2
+ F src/shell.c decd04236a7ef26be5ef46d4ea963044bfad9a48
 -F src/sqlite.h.in 8bbf8d9bc5f1a9474a633a2de7014506f1f06b90
++F src/sqlite.h.in 1c5172169121b89b2b08757acc57ec7a846f9c92
  F src/sqlite3_private.h 2a814d17913732831acf13e7e87860105a3416e4
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 798fb09648cefc159ac9b3ce5e00f5ada1377ed1
 -F src/sqliteInt.h 771087591052966d36ac1fcd3c8bb7a8c6cf9a38
++F src/sqliteInt.h 52b58043e97367686042345d2e581604e44a1cbf
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
- F src/test1.c 77ea7bcaab8656e28acee1cb4e327dd730476fcb
 -F src/test1.c d98ecaada53b5e4dbf37ea3ba339ac0d0926fda6
++F src/test1.c acdf3394565b1669657ea175013f418adb8fae44
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -249,10 -249,11 +249,11 @@@ F src/vdbeblob.c c3ccb7c8732858c680f442
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c 48dcef8bc757c2e7b488f68b5ddebb1650da2450
- F src/wal.c 6d8ee757f62bca9b0b713724677878dff5bf7e79
- F src/wal.h c1e05cdf3d42ed7c9263739ca8f5cdd8761e7de3
 -F src/wal.c de27c34c8016c00be348fc6bed588816557ceb66
 -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a
++F src/wal.c 11c17da2060683c9c0f3538f57e89643b0e2eb7e
++F src/wal.h 0835021ae243c2f1119e997e8af5d8cc3b991de1
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c 55403ce19c506be6a321c7f129aff693d6103db5
+ F test/8_3_names.test b93687beebd17f6ebf812405a6833bae5d1f4199
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
@@@ -941,11 -943,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 6a2ea52e6c09a570428161090c2f087c66f714ec
- R b49a9b1444f8fd9af23f810ca3a9099d
- T *bgcolor * #95b28e
- T *branch * apple-wal-readonly
- T *sym-apple-wal-readonly *
- T -sym-apple-osx *
 -P f9b149e53815235aaf92f722e37c4819503d72b3 67bf1c9a888b0d84d252d6c4c754c2c51994d208
 -R 3a925f20d37f60844aff7e1475163b7b
++P 97b980107676b2ea45a07c9c1a7de2e1ca74881f 8d1a6bb002a7817fa7df932f7cab7220c1d62c0e
++R 55067a82132bcf8831d179c443db5e2f
  U drh
- Z 6c6aea48ffe39f9291f96ce0e3f37ff9
 -Z bf0a7d24e91a5e532c4b622c64110df0
++Z 198f0d0d11e8401dbdcd4eff7ec30af8

diff --cc manifest.uuid
index ec4e8b3881310401b3c9363f8fe3a0d9fba1f808,880cb5a1ac488611fd2cb7738df3c30f6250eca9..9573f05e1e7145323c2e61857962730afe926402
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 97b980107676b2ea45a07c9c1a7de2e1ca74881f
 -8d1a6bb002a7817fa7df932f7cab7220c1d62c0e
++5791232778c825ec487a06c72b638dcb247cdd58

diff --cc src/main.c
Simple merge

diff --cc src/os_unix.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/sqlite.h.in
index a002a8b4ea8be0c2d3a8769c47227c6042004cde,f955d637414f06844b7aa80330fbc6cb7f7fcfb7..73b4504c1c9a609b35a20ad415bcda64230c17dc
--- 1/src/sqlite.h.in
--- 2/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@@ -453,10 -453,8 +453,11 @@@ int sqlite3_exec
  #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
  #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
  #define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
+ #define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
  
 +#define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
 +#define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
 +
  /*
  ** CAPI3REF: Flags For File Open Operations
  **
@@@ -2449,23 -2433,30 +2458,30 @@@ void sqlite3_progress_handler(sqlite3*
  ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
  ** is set in the fourth argument to sqlite3_open_v2(), or if it has
  ** been enabled globally using the [SQLITE_CONFIG_URI] option with the
- ** [sqlite3_config()] method. 
+ ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
+ ** As of SQLite version 3.7.7, URI filename interpretation is turned off
+ ** by default, but future releases of SQLite might enable URI filename
+ ** intepretation by default.  See "[URI filenames]" for additional
+ ** information.
  **
- ** URI filenames are parsed according to RFC 1738. If the URI contains an
- ** 'authority', then it must be either an empty string or the string 
+ ** URI filenames are parsed according to RFC 3986. ^If the URI contains an
+ ** authority, then it must be either an empty string or the string 
  ** "localhost". ^If the authority is not an empty string or "localhost", an 
- ** error is returned to the caller. ^The 'fragment' component of a URI, if 
- ** present, is always ignored.
- **
- ** ^SQLite uses the 'path' component of the URI as the path to the database file
- ** to open. ^If the path begins with a '/' character, then it is interpreted as
- ** an absolute path. ^If it does not begin with a '/', it is interpreted as a 
- ** relative path. ^On windows, the first component of an absolute path 
+ ** error is returned to the caller. ^The fragment component of a URI, if 
+ ** present, is ignored.
+ **
+ ** ^SQLite uses the path component of the URI as the name of the disk file
+ ** which contains the database. ^If the path begins with a '/' character, 
+ ** then it is interpreted as an absolute path. ^If the path does not begin 
+ ** with a '/' (meaning that the authority section is omitted from the URI)
+ ** then the path is interpreted as a relative path. 
+ ** ^On windows, the first component of an absolute path 
  ** is a drive specification (e.g. "C:").
  **
+ ** [[core URI query parameters]]
  ** The query component of a URI may contain parameters that are interpreted
- ** either by SQLite itself, or by a [sqlite3_vfs | custom VFS implementation].
+ ** either by SQLite itself, or by a [VFS | custom VFS implementation].
 -** SQLite interprets the following three query parameters:
 +** SQLite interprets the following four query parameters:
  **
  ** <ul>
  **   <li> <b>vfs</b>: ^The "vfs" parameter may be used to specify the name of

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test1.c
index 2f5c6517998ba355eded1a864c13b4123766473b,8d0fd6cf2f1d780e7c81ded171c82c1bdc4b2035..cd8d38d109503932c89903228a6d49dad398ac5c
--- 1/src/test1.c
--- 2/src/test1.c
+++ b/src/test1.c
@@@ -163,9 -163,8 +163,9 @@@ const char *sqlite3TestErrorName(int rc
      case SQLITE_IOERR_CHECKRESERVEDLOCK:
                                 zName = "SQLITE_IOERR_CHECKRESERVEDLOCK"; break;
      case SQLITE_IOERR_LOCK:          zName = "SQLITE_IOERR_LOCK";        break;
- 
 +    case SQLITE_READONLY_RECOVERY:   zName = "SQLITE_READONLY_RECOVERY"; break;
 +    case SQLITE_READONLY_CANTLOCK:   zName = "SQLITE_READONLY_CANTLOCK"; break;
+     case SQLITE_CORRUPT_VTAB:        zName = "SQLITE_CORRUPT_VTAB";      break;
 -                               zName = "SQLITE_IOERR_CHECKRESERVEDLOCK"; break;
      default:                         zName = "SQLITE_Unknown";           break;
    }
    return zName;

diff --cc src/wal.c
Simple merge

diff --cc src/wal.h
index aca5a56a569cc2f4d118af8fd087ac05df7f0855,a62b23bbdc99f2551bcb8f8083541b0968113478..df09beffe7db34cd88b4d7c8862206d1409d2c03
--- 1/src/wal.h
--- 2/src/wal.h
+++ b/src/wal.h
@@@ -21,8 -21,9 +21,9 @@@
  
  #ifdef SQLITE_OMIT_WAL
  # define sqlite3WalOpen(x,y,z)                   0
+ # define sqlite3WalLimit(x,y)
  # define sqlite3WalClose(w,x,y,z)                0
 -# define sqlite3WalBeginReadTransaction(y,z)     0
 +# define sqlite3WalBeginReadTransaction(x,y,z)   0
  # define sqlite3WalEndReadTransaction(z)
  # define sqlite3WalRead(v,w,x,y,z)               0
  # define sqlite3WalDbsize(y)                     0