Tests in lock.test no conform to the new locking scheme. (CVS 1557)

FossilOrigin-Name: a60afd04c5296020e5e72c4d35063fd1e6f90e9e

diff --git a/manifest b/manifest
index ffd981a29188a8db0fddbdcea1dbd5afba359f22..1c46a851c2280b76657caca13d61af3a6f1d72d3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbuffer\soverrun\sin\sthe\satomic\smultifile\scommit\slogic\sof\sthe\spager.\s(CVS\s1556)
-D 2004-06-10T00:51:44
+C Tests\sin\slock.test\sno\sconform\sto\sthe\snew\slocking\sscheme.\s(CVS\s1557)
+D 2004-06-10T01:08:06
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -155,7 +155,7 @@ F test/tester.tcl fc10520db0d3ce4ef6a8b5ab91bd102fc3f4280a
 F test/thread1.test 2fd5c10e82434f6b03be77b61fde5a050668abf2
 F test/threadtest1.c f7f896e62ed46feae1dc411114a48c15a0f82ee2
 F test/threadtest2.c d94ca4114fd1504f7e0ae724bcd83d4b40931d86
-F test/trans.test eae47c3a25b7f6c45296b1e472a4f8e3b3d91cdf
+F test/trans.test 4a26c6fa3639202c334521954c17d8abe8a1c8e8
 F test/trigger1.test 99b7cd9a568ac60aa04bbc3b9db9575ffa97709a
 F test/trigger2.test 0767ab30cb5a2c8402c8524f3d566b410b6f5263
 F test/trigger3.test a95ccace88291449f5eae7139ec438a42f90654d
@@ -218,7 +218,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P a22283512afe2df09d5783d189fbd7389ed313ad
-R 44c0fe57aaff3fee6a9e59ee85ca7073
+P 3b78ffe0b5dfa20e5c638d85ed400afda8a9f948
+R c24b45928c08ef79b943729c16fbee09
 U drh
-Z e14cb70585259da837e18dc09e5b8e61
+Z d26763f7e9e7e34a6d973c83f7a82c78

diff --git a/manifest.uuid b/manifest.uuid
index 6667cbaf8470ee25ae6ffb989b483b5f912c2752..177b4179a525dfc4a5b3c4cb3bbc6a62339f04db 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b78ffe0b5dfa20e5c638d85ed400afda8a9f948
\ No newline at end of file
+a60afd04c5296020e5e72c4d35063fd1e6f90e9e
\ No newline at end of file

diff --git a/test/trans.test b/test/trans.test
index 1f3cd7682879e4dadd0ca02fa9940831922471b7..f76e9dccfe35f19b4383e8599a20396ec290398f 100644 (file)
--- a/test/trans.test
+++ b/test/trans.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: trans.test,v 1.21 2004/06/09 19:03:55 drh Exp $
+# $Id: trans.test,v 1.22 2004/06/10 01:08:06 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -93,53 +93,45 @@ do_test trans-3.1 {
   }
 } {1 2 3}
 do_test trans-3.2 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM two ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 5 10}}
 do_test trans-3.3 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM one ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 2 3}}
 do_test trans-3.4 {
-  set v [catch {execsql {
+  catchsql {
     INSERT INTO one VALUES(4,'four');
-  }} msg]
-  lappend v $msg
+  }
 } {0 {}}
 do_test trans-3.5 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM two ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 5 10}}
 do_test trans-3.6 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM one ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 2 3}}
 do_test trans-3.7 {
-  set v [catch {execsql {
+  catchsql {
     INSERT INTO two VALUES(4,'IV');
-  }} msg]
-  lappend v $msg
+  }
 } {0 {}}
 do_test trans-3.8 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM two ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 5 10}}
 do_test trans-3.9 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM one ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 2 3}}
 do_test trans-3.10 {
   execsql {END TRANSACTION}
 } {}
@@ -182,44 +174,38 @@ do_test trans-4.2 {
   lappend v $msg
 } {1 {cannot rollback - no transaction is active}}
 do_test trans-4.3 {
-  set v [catch {execsql {
+  catchsql {
     BEGIN TRANSACTION;
     UPDATE two SET a = 0 WHERE 0;
     SELECT a FROM two ORDER BY a;
-  } db} msg]
-  lappend v $msg
+  } db
 } {0 {1 4 5 10}}
 do_test trans-4.4 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM two ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 4 5 10}}
 do_test trans-4.5 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM one ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 2 3 4}}
 do_test trans-4.6 {
-  set v [catch {execsql {
+  catchsql {
     BEGIN TRANSACTION;
     SELECT a FROM one ORDER BY a;
-  } db} msg]
-  lappend v $msg
+  } db
 } {1 {cannot start a transaction within a transaction}}
 do_test trans-4.7 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM two ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 4 5 10}}
 do_test trans-4.8 {
-  set v [catch {execsql {
+  catchsql {
     SELECT a FROM one ORDER BY a;
-  } altdb} msg]
-  lappend v $msg
-} {1 {database is locked}}
+  } altdb
+} {0 {1 2 3 4}}
 do_test trans-4.9 {
   set v [catch {execsql {
     END TRANSACTION;