Minor changes to test cases to account for the fact that databases with read/write...

FossilOrigin-Name: 278ed41e1d4bbff9544cb2cf4cf52dbbcf0c17df

diff --git a/manifest b/manifest
index f648a1e9770ac998ef940140b1e0e333796c32a7..be9552df7d3c1ac94e5b79a79cadfc3ad7332724 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sread\sand\swrite\sversion\sfields\sof\sthe\sdatabase\sheader\sto\smark\sa\sdatabase\sas\soperating\sin\swal-mode.
-D 2010-04-20T18:53:15
+C Minor\schanges\sto\stest\scases\sto\saccount\sfor\sthe\sfact\sthat\sdatabases\swith\sread/write\sversions\sof\s2\sare\snow\sunderstood.
+D 2010-04-21T06:19:13
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -170,7 +170,7 @@ F src/select.c b7c9a40bc1567bceff52ad4b73108734ee4bf268
 F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
 F src/sqlite.h.in b9b0365613d4a99a0e6bc0ae6dbc73cc4a7e7cb7
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
-F src/sqliteInt.h 6ed0ed77103d00006d6a534c0239baf6decadb3f
+F src/sqliteInt.h 8da48f67766bafb916b551482c51d8aad1be2331
 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
 F src/status.c 4df6fe7dce2d256130b905847c6c60055882bdbe
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -305,7 +305,7 @@ F test/corrupt6.test e69b877d478224deab7b66844566258cecacd25e
 F test/corrupt7.test 1eb2214f29474fa6b155aa3da8a7d46bf52089e1
 F test/corrupt8.test 9992ef7f67cefc576b92373f6bf5ab8775280f51
 F test/corrupt9.test 4aa1cb1ef091cb0e13e89a819c72911631b5176a
-F test/corruptA.test 99e95620b980161cb3e79f06a884a4bb8ae265ff
+F test/corruptA.test a2fb8d8037e5105d21dc094c3ef44864934325dd
 F test/corruptB.test d88b500f7994cb2eb9646410c263111e9831f889
 F test/corruptC.test 691ed070baef5e1345939caadf270a52837a5064
 F test/corruptD.test 3ae6e2dc6e2226c6935a8a40d4b5ee3eba75f8c0
@@ -542,7 +542,7 @@ F test/quick.test 6f202befe1cfae0b63df96b3120a8022ab11f574
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
 F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
-F test/rdonly.test bd054831f8a3078e765a0657e247182486f0cb47
+F test/rdonly.test 329558d8f3f7679e7e00f5f1d7cdd5dde78ba382
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/rollback.test 73355ad4492ff9a3a31e61c7e5eb5e01a1de94ca
 F test/rowhash.test 97f56043ba11f0679920416c0cdbc72e5272267b
@@ -807,7 +807,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9bda601455705475075e33bfa85687bce34b15ff
-R b30f3db6dd942a33d471d74ec2e33c70
+P 96bef18c1411c3e0348295886f105e1646c46320
+R 9d271c34e1ffdb3d856b3b8726b0e8d7
 U dan
-Z d82da3172ce11d2f9fc95cc996cdb180
+Z 58b9eaab75f6eeb69a49f445ee7bfb3c

diff --git a/manifest.uuid b/manifest.uuid
index 8af34827b8ce1fe8cff5eed6ceb35717c5fe90c6..3378df2d22a5cf872c3b93c7d260b2e149d201bd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-96bef18c1411c3e0348295886f105e1646c46320
\ No newline at end of file
+278ed41e1d4bbff9544cb2cf4cf52dbbcf0c17df
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 1dfc86da249cbb456c9f0a4756f36c2c28c74c21..a93f56b67743b66591d4ef54cc017cdf4e2abec3 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -823,7 +823,7 @@ struct sqlite3 {
   void (*xRollbackCallback)(void*); /* Invoked at every commit. */
   void *pUpdateArg;
   void (*xUpdateCallback)(void*,int, const char*,const char*,sqlite_int64);
-  int (*xLogCallback)(void *, sqlite3 *, const char *, u32);
+  int (*xLogCallback)(void *, sqlite3 *, const char *, int);
   void *pLogArg;
   void(*xCollNeeded)(void*,sqlite3*,int eTextRep,const char*);
   void(*xCollNeeded16)(void*,sqlite3*,int eTextRep,const void*);
@@ -2992,6 +2992,7 @@ void sqlite3ExprListCheckLength(Parse*, ExprList*, const char*);
 CollSeq *sqlite3BinaryCompareCollSeq(Parse *, Expr *, Expr *);
 int sqlite3TempInMemory(const sqlite3*);
 VTable *sqlite3GetVTable(sqlite3*, Table*);
+const char *sqlite3JournalModename(int);
 
 /* Declarations for functions in fkey.c. All of these are replaced by
 ** no-op macros if OMIT_FOREIGN_KEY is defined. In this case no foreign

diff --git a/test/corruptA.test b/test/corruptA.test
index fa3257f3df4fef388db73f9191114cb7cc5dd2af..5d5e6f49a29cfba82a1949bebab929a01d151a3b 100644 (file)
--- a/test/corruptA.test
+++ b/test/corruptA.test
@@ -39,7 +39,7 @@ file copy -force test.db test.db-template
 
 do_test corruptA-2.1 {
   file copy -force test.db-template test.db
-  hexio_write test.db 19 02   ;# the read format number
+  hexio_write test.db 19 03   ;# the read format number
   sqlite3 db test.db
   catchsql {SELECT * FROM t1}  
 } {1 {file is encrypted or is not a database}}

diff --git a/test/rdonly.test b/test/rdonly.test
index a975cef97b1b5610cd312b2b7c866df02aa07a84..cd611aeee5a3a6363d8288b3e2b579f3db2121b5 100644 (file)
--- a/test/rdonly.test
+++ b/test/rdonly.test
@@ -29,7 +29,7 @@ do_test rdonly-1.1 {
   }
 } {1}
 
-# Changes the write version from 1 to 2.  Verify that the database
+# Changes the write version from 1 to 3.  Verify that the database
 # can be read but not written.
 #
 do_test rdonly-1.2 {
@@ -37,7 +37,7 @@ do_test rdonly-1.2 {
   hexio_get_int [hexio_read test.db 18 1]
 } 1
 do_test rdonly-1.3 {
-  hexio_write test.db 18 02
+  hexio_write test.db 18 03
   sqlite3 db test.db
   execsql {
     SELECT * FROM t1;
@@ -68,7 +68,7 @@ do_test rdonly-1.5 {
 # the database is read-only until after it is locked.
 #
 do_test rdonly-1.6 {
-  hexio_write test.db 18 02              ; # write-version
+  hexio_write test.db 18 03              ; # write-version
   hexio_write test.db 24 11223344        ; # change-counter
   catchsql {
     INSERT INTO t1 VALUES(2);