Minor fixes for test cases. No code changes.

FossilOrigin-Name: ef2a6a37366f91889dc2f1ba9cb6d1257d9b05db

diff --git a/manifest b/manifest
index 6602baaafbabc405aeac9915b348f0fed4e74f51..cabb3227c31327e6fd8e08c7197d89ab8d6d0121 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\stest.
-D 2013-08-21T19:59:14.262
+C Minor\sfixes\sfor\stest\scases.\sNo\scode\schanges.
+D 2013-08-21T20:04:54.847
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -644,7 +644,7 @@ F test/make-where7.tcl 05c16b5d4f5d6512881dfec560cb793915932ef9
 F test/malloc.test fd368e31fe98d4779ed80442f311ed9f03bcd1f7
 F test/malloc3.test e3b32c724b5a124b57cb0ed177f675249ad0c66a
 F test/malloc4.test 957337613002b7058a85116493a262f679f3a261
-F test/malloc5.test a577cbbcc1594c7763b9b3515b3633555751c7f0
+F test/malloc5.test fafce0aa9157060445cd1a56ad50fc79d82f28c3
 F test/malloc6.test 2f039d9821927eacae43e1831f815e157659a151
 F test/malloc7.test 7c68a32942858bc715284856c5507446bba88c3a
 F test/malloc8.test 9b7a3f8cb9cf0b12fff566e80a980b1767bd961d
@@ -1039,7 +1039,7 @@ F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 F test/where.test da54153a4c1571ea1b95659e5bec8119edf786aa
-F test/where2.test b1830f762f837153a4c9743adaab90a5761f73e7
+F test/where2.test 76d5346f7edb2a6a0442dcf3e9d088ac6903e0b5
 F test/where3.test d28c51f257e60be30f74308fa385ceeddfb54a6e
 F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
 F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
@@ -1105,7 +1105,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P b25bac79191975149d88fe34618c74354de62c5e
-R 4256e507dbd56983b9201102947b35fd
-U mistachkin
-Z 855e1f4db08112408b490484d606f43b
+P f9859fe93bcecb4be7c1034291018523124c4a5c
+R ddee5479b507575b9f0433a0c601d21b
+U dan
+Z 54b08646e994fdf84c4fc6867487aa5d

diff --git a/manifest.uuid b/manifest.uuid
index 9ed90e96446d16a575b2dd5fa9db9695acbff08e..def9fd1722740271e4d4896f2c7a77cfc1feac58 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f9859fe93bcecb4be7c1034291018523124c4a5c
\ No newline at end of file
+ef2a6a37366f91889dc2f1ba9cb6d1257d9b05db
\ No newline at end of file

diff --git a/test/malloc5.test b/test/malloc5.test
index c02f65e3446e344b367447bab0dce6bcd1f6f3a1..6abedf79e1c438c1302955074884b144c83c3c8b 100644 (file)
--- a/test/malloc5.test
+++ b/test/malloc5.test
@@ -205,6 +205,7 @@ do_test malloc5-4.1 {
     execsql "INSERT INTO abc VALUES($i, $i, '[string repeat X 100]');"
   }
   execsql {COMMIT;}
+  db cache flush
   sqlite3_release_memory
   sqlite3_memory_highwater 1
   execsql {SELECT * FROM abc}
@@ -213,6 +214,7 @@ do_test malloc5-4.1 {
   expr $nMaxBytes > 1000000
 } {1}
 do_test malloc5-4.2 {
+  db cache flush
   sqlite3_release_memory
   sqlite3_soft_heap_limit 100000
   sqlite3_memory_highwater 1

diff --git a/test/where2.test b/test/where2.test
index c827ecc7b5af07243c9b013e92c8c88975a7caf6..a3858c59093fa389fdb570b070371a73ac0e72f9 100644 (file)
--- a/test/where2.test
+++ b/test/where2.test
@@ -701,6 +701,7 @@ do_test where2-11.4 {
 
 # Verify that the OR clause is used in an outer loop even when
 # the OR clause scores slightly better on an inner loop.
+if {[permutation] != "no_optimization"} {
 do_execsql_test where2-12.1 {
   CREATE TABLE t12(x INTEGER PRIMARY KEY, y);
   CREATE INDEX t12y ON t12(y);
@@ -709,6 +710,7 @@ do_execsql_test where2-12.1 {
       FROM t12 AS a JOIN t12 AS b ON a.y=b.x
      WHERE (b.x=$abc OR b.y=$abc);
 } {/.*SEARCH TABLE t12 AS b .*SEARCH TABLE t12 AS b .*/}
+}
 
 
 finish_test