diff --git a/manifest b/manifest index e1486c1df2..7ecb8998c6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Changes\sto\sjrnlmode.test\sto\saccount\sfor\sin-memory\stemp\sdatabases.\s(CVS\s6483) -D 2009-04-10T15:02:44 +C Disable\sthe\sselect1-15\stests\swhen\slocking_mode\sis\sEXCLUSIVE.\s\sTicket\s#3771.\s(CVS\s6484) +D 2009-04-10T15:38:43 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -515,7 +515,7 @@ F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd F test/savepoint6.test e28f7d8ab8a389d4e5bd1dc08bf2c3312754cc67 F test/schema.test deafe5472099ab5bc65748059dc5182fc8ebad74 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5 -F test/select1.test fff339661707c5bfa0f2bd4974ceabe9b5d7f774 +F test/select1.test 7de2cabb417c142c40e5b8005855b8bd4eedc9e7 F test/select2.test 9735da20ccd41e42bf2b4c19fd939141b591adae F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054 F test/select4.test b64d5d248d008e1dc365f451c76090bde907e665 @@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 57e3e6b3cb54e6626bee41a084c927ee264b6d03 -R 128b04f123dcbb16ad4c13e86f0b3e91 -U danielk1977 -Z 11aa570c8f3f375f7871c54c56c05b7d +P c31d4359ae056dca9e9de61ef8ceb683b92850e7 +R 2f7d2faa97bf63d1e1c8bdd54d4e1b59 +U drh +Z f1d1f71c2dd9506a6b873860f856672a diff --git a/manifest.uuid b/manifest.uuid index 2910183477..5b6aa61ca9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c31d4359ae056dca9e9de61ef8ceb683b92850e7 \ No newline at end of file +88cefbb4a12ab7037f025141ddbe041ea82a6c61 \ No newline at end of file diff --git a/test/select1.test b/test/select1.test index 145a982d63..2fa7bb4f4f 100644 --- a/test/select1.test +++ b/test/select1.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this file is testing the SELECT statement. # -# $Id: select1.test,v 1.66 2009/04/02 17:23:33 danielk1977 Exp $ +# $Id: select1.test,v 1.67 2009/04/10 15:38:43 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -1041,24 +1041,27 @@ do_test select1-14.2 { } } {0} -# Check that ticket #3771 has been fixed. -# -do_test select1-15.1 { - execsql { - CREATE TABLE t1(a); - CREATE INDEX i1 ON t1(a); - INSERT INTO t1 VALUES(1); - INSERT INTO t1 VALUES(2); - INSERT INTO t1 VALUES(3); - } -} {} -do_test select1-15.2 { - sqlite3 db2 test.db - execsql { DROP INDEX i1 } db2 - db2 close -} {} -do_test select1-15.3 { - execsql { SELECT 2 IN (SELECT a FROM t1) } -} {1} - +if {[db one {PRAGMA locking_mode}]=="normal"} { + # Check that ticket #3771 has been fixed. This test does not + # work with locking_mode=EXCLUSIVE so disable in that case. + # + do_test select1-15.1 { + execsql { + CREATE TABLE t1(a); + CREATE INDEX i1 ON t1(a); + INSERT INTO t1 VALUES(1); + INSERT INTO t1 VALUES(2); + INSERT INTO t1 VALUES(3); + } + } {} + do_test select1-15.2 { + sqlite3 db2 test.db + execsql { DROP INDEX i1 } db2 + db2 close + } {} + do_test select1-15.3 { + execsql { SELECT 2 IN (SELECT a FROM t1) } + } {1} +} + finish_test