Add tests to make sure the busy handler resets. (CVS 4865)

FossilOrigin-Name: 5e4df441815ed7d02e9ad8ee2e1c2f937ee675d7

diff --git a/manifest b/manifest
index e22798b7cd89f2bee28e1acc23b6d8cdfa365e6b..4ba4d6084345264120ea285368b43ccfb5101ecc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reset\sthe\sbusy\scallback\siteration\scounter\sat\sthe\sbeginning\sof\seach\nlock\stest\sloop.\s(CVS\s4864)
-D 2008-03-14T19:33:06
+C Add\stests\sto\smake\ssure\sthe\sbusy\shandler\sresets.\s(CVS\s4865)
+D 2008-03-15T02:09:22
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 5be94fea84f1599672e5041de03b97990baca593
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -223,7 +223,7 @@ F test/btree6.test a5ede6bfbbb2ec8b27e62813612c0f28e8f3e027
 F test/btree7.test a6d3b842db22af97dd14b989e90a2fd96066b72f
 F test/btree8.test fadc112bcbd6a0c622d34c813fc8a648eacf8804
 F test/btree9.test 5d8711b241145b90f65dd1795d5dd8290846fa5e
-F test/busy.test 0271c854738e23ad76e10d4096a698e5af29d211
+F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 F test/cache.test 3ff445c445742a7b6b9ba6e1d62a25263f9424b9
 F test/capi2.test cc64df7560a96f848f919ea2926c60acf639684b
 F test/capi3.test 590134ad001c831698f5b5b4b3911a45fbadba12
@@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 6db7186c304ed5e06afb207ce11ebc2a47e491b0
-R 87d443b39169d76481a95bb272b47f45
+P 66777f048195e4242905c40f790ed7360af7028b
+R d085a4d2bb229e9074372fcf51b9d75a
 U drh
-Z 7ebbab3c09843c4d2af968290634f99a
+Z bac5113aa0aec201b601763ef92cbc42

diff --git a/manifest.uuid b/manifest.uuid
index 71afb037221169cb1ff3def956d76c9fc6e646ad..e9b0fc1a650a819f86028b2a35c42a73b083b4e5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-66777f048195e4242905c40f790ed7360af7028b
\ No newline at end of file
+5e4df441815ed7d02e9ad8ee2e1c2f937ee675d7
\ No newline at end of file

diff --git a/test/busy.test b/test/busy.test
index f5a4072e204ede8f23af7e6b2069fb32ef7ada6e..585f764547717a4f1b1b70240844b28b20f990d2 100644 (file)
--- a/test/busy.test
+++ b/test/busy.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file test the busy handler
 #
-# $Id: busy.test,v 1.2 2005/09/17 18:02:37 drh Exp $
+# $Id: busy.test,v 1.3 2008/03/15 02:09:22 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -32,12 +32,29 @@ proc busy x {
 set busyargs {}
 do_test busy-1.2 {
   db busy busy
-  db2 eval {begin exclusive}
-  catchsql {begin immediate}
+  db2 eval {BEGIN EXCLUSIVE}
+  catchsql {BEGIN IMMEDIATE}
 } {1 {database is locked}}
 do_test busy-1.3 {
   set busyargs
 } {0 1 2 3}
+do_test busy-1.4 {
+  set busyargs {}
+  catchsql {BEGIN IMMEDIATE}
+  set busyargs
+} {0 1 2 3}
+
+do_test busy-2.1 {
+  db2 eval {COMMIT}
+  db eval {BEGIN; INSERT INTO t1 VALUES(5)}
+  db2 eval {BEGIN; SELECT * FROM t1}
+  set busyargs {}
+  catchsql COMMIT
+} {1 {database is locked}}
+do_test busy-2.2 {
+  set busyargs
+} {0 1 2 3}
+
 
 db2 close