From: drh Date: Tue, 31 May 2011 17:08:32 +0000 (+0000) Subject: Merge the latest trunk changes into the wal-readonly branch. X-Git-Tag: version-3.7.7~81^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdd0f3bc0e2bf20d4151c9eb606e5c633d3234de;p=thirdparty%2Fsqlite.git Merge the latest trunk changes into the wal-readonly branch. FossilOrigin-Name: 2c6b5a28e3f6b7cb96b944d0a254f3707885f1ce --- bdd0f3bc0e2bf20d4151c9eb606e5c633d3234de diff --cc manifest index 15dda4253a,9323cd6b55..22534d04aa --- a/manifest +++ b/manifest @@@ -1,7 -1,7 +1,7 @@@ - C Add\smissing\scomments\sassociated\swith\sreadonly\sshm\schanges. - D 2011-05-11T17:36:17.276 -C Fix\sa\sproblem\sin\sthe\ssqlite3TestErrorName()\sfunction\s(used\sonly\sfor\stesting)\nthat\sappears\sto\shave\soriginated\sfrom\sa\sbad\smerge. -D 2011-05-31T16:50:23.129 ++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\swal-readonly\sbranch. ++D 2011-05-31T17:08:32.975 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2 + F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 @@@ -122,8 -122,8 +122,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 0d3b39dcb79565c053e35fc12713f12d8a74d6a9 -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 @@@ -144,7 -144,7 +144,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85 - F src/main.c a145cea130adfe945ab1fa7e9543c492e3f2f419 -F src/main.c 059daeed5876b3604f0192f838faf5f4db138901 ++F src/main.c 4e55ff4800181e3ad063492740f54ce406de5deb F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 @@@ -163,30 -163,30 +163,30 @@@ 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 03630dd062c3d1fb9f25e2a227048b709c5babff - F src/os_win.c ff0e14615a5086fa5ba6926e4ec0dc9cfb5a1a84 - F src/pager.c 4056376f83f85cea9922a11161087c529e39f7dc -F src/os_unix.c 6d4a58d81ad4b782406519f3790202f330e89bb7 ++F src/os_unix.c af3c3f6a0fc6dbde802e55848f1cad7fb2121ff3 + F src/os_win.c 218b899469e570d46eb8147c2383075f7c026230 -F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41 -F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1 ++F src/pager.c 2cf3bad86e6fbac42d9dbd3b89799185a343b17b +F src/pager.h 34c6b029446f06f40847746d22faac0d354dd909 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 49c90ab27a4339d4b5bc0b03c08cbcf20ed8d454 + F src/pragma.c 9e778decc3ee9bcaf88904b4a3b0a4360aaf0eab F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4 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 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79 - F src/sqlite.h.in adeb2c8019a3851a10e3872f44b34c95c6e409f2 + F src/shell.c decd04236a7ef26be5ef46d4ea963044bfad9a48 -F src/sqlite.h.in c095996e68e0082f674f32e68ca909fc24196a2a ++F src/sqlite.h.in 55fe75ae0d2ee71c33283bae647443c8ec8400be F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754 - F src/sqliteInt.h 798fb09648cefc159ac9b3ce5e00f5ada1377ed1 -F src/sqliteInt.h d9ff5f198b5bac7ee0c6e1ea55f76897ba4dda87 ++F src/sqliteInt.h 8936583efbbc5820e9b01befa6e76947a2be8f52 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b - F src/test1.c 6ae026cd9d2b1b1e95a372a7460d091705db645d -F src/test1.c 9f61b9d23938bc5dd165ec7b95a91c30ce6e66db ++F src/test1.c efca486a25fb894988e7a82e84579a4e57388a02 F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31 F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432 F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7 @@@ -244,11 -244,12 +244,12 @@@ F src/vdbeaux.c 99900868d18618a07ffaf78 F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562 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/vtab.c 9ba8c7fdb7d39260c033a402f6032d3e7bc5d336 -F src/wal.c ab1d8c5abf904fd6396f90499cbd8c54b8d6961b -F src/wal.h 66b40bd91bc29a5be1c88ddd1f5ade8f3f48728a ++F src/wal.c 861ea98779dac3867e5f97d13e61cbbb39b310b0 ++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 @@@ -936,7 -938,7 +939,7 @@@ F tool/speedtest8.c 2902c46588c40b55661 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f - P cde45a033ee6834900f5f5c272c383408883a74c - R 77f3671cb0a1ec2771484489a2a100be - U dan - Z 826df29e354d14eb64673fd89c39c62e -P 701b8a23e3ea2c94454af5d9bd1e72acb66d0fe2 -R 0252c62ef68072dedfcd687577c244b5 ++P 6a2ea52e6c09a570428161090c2f087c66f714ec a0ae314c7f41d0146a9ee1adc576cd977219a378 ++R 2d882c761e53216861edc4b651b9e13f + U drh -Z 32d78009c9e58634b2f842adf352a1be ++Z 136bd350bac5191ea5a92cebd8db2492 diff --cc manifest.uuid index 68e3f5666d,55d88bed1a..80f0eef0d9 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 6a2ea52e6c09a570428161090c2f087c66f714ec -a0ae314c7f41d0146a9ee1adc576cd977219a378 ++2c6b5a28e3f6b7cb96b944d0a254f3707885f1ce diff --cc src/sqlite.h.in index a002a8b4ea,a9d60e8a2d..3ee5dda1bd --- a/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: ** **