Add trivial test case to make sure shared-cache mode does not automatically turn...

FossilOrigin-Name: a0ab3902f1431c962a5d034647ef3c6876dc0e75

diff --git a/manifest b/manifest
index 0adf9fce2a5aaee41b2680ece2d4deb4d901ebfa..7270448e5079393ae4f6e4fb4c353653fee67fa8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\stests\sfor\scompound\sSELECT\sstatements.
-D 2010-09-14T18:56:53
+C Add\strivial\stest\scase\sto\smake\ssure\sshared-cache\smode\sdoes\snot\sautomatically\sturn\son\sexclusive-locking\smode.
+D 2010-09-15T11:42:04
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -498,7 +498,7 @@ F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
 F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
 F test/lock6.test 8df56060f396151777390982422c800d026e1722
 F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
-F test/lock_common.tcl 18c637fc89e12f1ac0d27d2186f12c3d3f789e3e
+F test/lock_common.tcl 43fef46b1c5b8ac05e382eab214705c23c70bc88
 F test/lookaside.test 382e7bc2fab23d902c8eafb1b9ed7ababfff75a6
 F test/main.test 9d7bbfcc1b52c88ba7b2ba6554068ecf9939f252
 F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
@@ -576,7 +576,7 @@ F test/rollback.test 1a83118ea6db4e7d8c10eaa63871b5e90502ffdc
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
 F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
-F test/savepoint.test 2b6c154ef80d086da9eb7afd8579f782b98076fd
+F test/savepoint.test d3dd00e0137fc4b4659bde378a4d8f2cd07238a3
 F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
 F test/savepoint3.test e328085853b14898d78ceea00dfe7db18bb6a9ec
 F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
@@ -600,7 +600,7 @@ F test/selectB.test f305cc6660804cb239aab4e2f26b0e288b59958b
 F test/selectC.test f9bf1bc4581b5b8158caa6e4e4f682acb379fb25
 F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
 F test/shared.test b9114eaea7e748a3a4c8ff7b9ca806c8f95cef3e
-F test/shared2.test d6ba4ca1827ea36a1ac23a99e3c36eeac9165450
+F test/shared2.test 7f6ad2d857d0f4e5d6a0b9a897b5e56a6b6ea18c
 F test/shared3.test d69bdd5f156580876c5345652d21dc2092e85962
 F test/shared4.test d0fadacb50bb6981b2fb9dc6d1da30fa1edddf83
 F test/shared6.test 990d2584b5db28e6e1f24742c711b26e59757b67
@@ -857,7 +857,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 3e11f5155c5625ddf4300a9ef7e8bc20a190a752
-R ffe9d538878a55690e1d687b68362469
+P a0f01ebab9bd42fca9ce5d97f8cbf44afd803f4e
+R 3b07812fa7ffe651e3d23f156f91296a
 U dan
-Z 409ed711cbd7fa2b841cc7bdcb3c8b83
+Z c0451ba7dfb3514907a6c35a2fc14f3d

diff --git a/manifest.uuid b/manifest.uuid
index 49e02e63727166d51fb9a19cf2e31cbee491d0f3..815de54bb27e2dc2c11bf6c2004604062571ccb6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a0f01ebab9bd42fca9ce5d97f8cbf44afd803f4e
\ No newline at end of file
+a0ab3902f1431c962a5d034647ef3c6876dc0e75
\ No newline at end of file

diff --git a/test/lock_common.tcl b/test/lock_common.tcl
index 0b7c5f9229860210a7aeec8aadefd6cb14e2ba6d..672f9a5f9596fc759f6b7ff24bf37e48245ff931 100644 (file)
--- a/test/lock_common.tcl
+++ b/test/lock_common.tcl
@@ -58,6 +58,7 @@ proc do_multiclient_test {varname script} {
     code3 { db3 close }
     catch { close $::code2_chan }
     catch { close $::code3_chan }
+    catch { db close }
   }
 }
 

diff --git a/test/savepoint.test b/test/savepoint.test
index 5b41c4579b8c0930e32247977c3d512317bb3328..3ff0f924304c865b5e450b217cae04a2c2947014 100644 (file)
--- a/test/savepoint.test
+++ b/test/savepoint.test
@@ -1026,6 +1026,7 @@ do_multiclient_test tn {
 # (even though it had been removed from the database by the ROLLBACK 
 # command).
 #
+sqlite3 db test.db
 do_execsql_test savepoint-17.1 {
   BEGIN;
     CREATE TABLE t6(a, b);

diff --git a/test/shared2.test b/test/shared2.test
index 37f9516f68e150f59277eec779b9bf4df009522b..d2a0d1b0f0490f5ffb64e77c0890ccf403045b6f 100644 (file)
--- a/test/shared2.test
+++ b/test/shared2.test
@@ -13,6 +13,8 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+source $testdir/lock_common.tcl
+source $testdir/malloc_common.tcl
 db close
 
 ifcapable !shared_cache {
@@ -166,5 +168,14 @@ do_test shared2-5.1 {
 db close
 db2 close
 
+# The following test verifies that shared-cache mode does not automatically
+# turn on exclusive-locking mode for some reason.
+do_multiclient_test {tn} {
+  sql1 { CREATE TABLE t1(a, b) }
+  sql2 { CREATE TABLE t2(a, b) }
+  do_test shared2-6.$tn.1 { sql1 { SELECT * FROM t2 } } {}
+  do_test shared2-6.$tn.2 { sql2 { SELECT * FROM t1 } } {}
+}
+
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test