diff --git a/manifest b/manifest index 413de553c3..72bbe61ff3 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Instead\sof\sstoring\sa\spointer\sto\sthe\sparent\spage\sin\sthe\sMemPage\sstructure,\shave\seach\sB-Tree\scursor\skeep\strack\sof\sthe\sancestry\sof\sthe\scurrent\spage.\s(CVS\s5747) -D 2008-09-29T11:49:48 +C Update\sshared_err.test\sto\swork\swith\s(5668)\s(return\sSQLITE_CORRUPT\sif\srollback\sfails).\s(CVS\s5748) +D 2008-09-29T14:12:57 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -486,7 +486,7 @@ F test/shared.test b9f3bbd3ba727c5f1f8c815b7d0199262aacf214 F test/shared2.test 0ee9de8964d70e451936a48c41cb161d9134ccf4 F test/shared3.test 9c880afc081d797da514ef64bccf36f3fce2f09c F test/shared4.test d0fadacb50bb6981b2fb9dc6d1da30fa1edddf83 -F test/shared_err.test 63628d33e0d59325c63650f5d67f4c8798cef5db +F test/shared_err.test ca197017cb84146a99937fc3183b4c9371bf0b4b F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329 F test/soak.test 3c317b3e55e1160731030c8e865d1858fab66fea @@ -637,7 +637,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P efe095e0cb8e0f8a11fd9cc321ec83b556458bf2 -R a0f3c37847099f2dcfb6efb98a6a77ac +P 40425e93421286cca1965d7a5769084526210c7a +R 35cba72f6c9edee4c5886f7c1e12d335 U danielk1977 -Z 079550270237333fc6211bd885a42871 +Z f975bf8ece71959ef54f545ea97809a1 diff --git a/manifest.uuid b/manifest.uuid index b57fb3d6a6..996892645d 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -40425e93421286cca1965d7a5769084526210c7a \ No newline at end of file +292acaf7c4e68b532cc8d1763e02aa79d90ea20c \ No newline at end of file diff --git a/test/shared_err.test b/test/shared_err.test index 7c8b5488a1..c6f046c062 100644 --- a/test/shared_err.test +++ b/test/shared_err.test @@ -13,7 +13,7 @@ # cache context. What happens to connection B if one connection A encounters # an IO-error whilst reading or writing the file-system? # -# $Id: shared_err.test,v 1.22 2008/09/15 14:42:38 danielk1977 Exp $ +# $Id: shared_err.test,v 1.23 2008/09/29 14:12:57 danielk1977 Exp $ proc skip {args} {} @@ -410,11 +410,19 @@ do_malloc_test shared_err-8 -tclprep { ROLLBACK; } } -cleanup { + # UPDATE: As of [5668], if the rollback fails SQLITE_CORRUPT is returned. + # So these tests have been updated to expect SQLITE_CORRUPT and its + # associated English language error message. + # do_test shared_malloc-8.$::n.cleanup.1 { set res [catchsql {SELECT a FROM t1} db2] set ans [lindex $res 1] if {[lindex $res 0]} { - set r [expr {$ans=="disk I/O error" || $ans=="out of memory"}] + set r [expr { + $ans=="disk I/O error" || + $ans=="out of memory" || + $ans=="database disk image is malformed" + }] } else { set r [expr {[lrange $ans 0 1]=="0000000000 1111111111"}] } @@ -429,7 +437,8 @@ do_malloc_test shared_err-8 -tclprep { ($rc1=="SQLITE_DONE" && $rc2=="SQLITE_OK") || ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_ABORT") || ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_NOMEM") || - ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_IOERR") + ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_IOERR") || + ($rc1=="SQLITE_ERROR" && $rc2=="SQLITE_CORRUPT") } } {1} db2 close