Update a couple of existing test cases.

FossilOrigin-Name: dcb8fa0f77a44250df0e8c4f6cfb9f6e181982d7

diff --git a/manifest b/manifest
index 67f50b5a99780b41b971e714ee777144c84d1866..508b8682ec326dbc5455e8f2d063fa21723764ee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sto\sfts4merge.test.
-D 2012-03-22T17:48:00.732
+C Update\sa\scouple\sof\sexisting\stest\scases.
+D 2012-03-23T11:07:22.067
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -500,7 +500,7 @@ F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 F test/fts4merge.test 663607bef5575027295d0b7168370ccd0bae6522
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
-F test/fts4merge3.test 2d2008772f45afc617fc34d10bcafbc8de1ca2ae
+F test/fts4merge3.test e0e21332f592fc003fcab112928ea891407d83cb
 F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
@@ -859,7 +859,7 @@ F test/tkt3997.test a335fa41ca3985660a139df7b734a26ef53284bd
 F test/tkt4018.test 7c2c9ba4df489c676a0a7a0e809a1fb9b2185bd1
 F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
 F test/trace.test 4b36a41a3e9c7842151af6da5998f5080cdad9e5
-F test/trace2.test 95f6d519f534b171b8d3d1aacbb03931b4443fb4
+F test/trace2.test 9e4c0b3d4a85494acf1c1e077276d1e934100ce4
 F test/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6
 F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
 F test/trans3.test 373ac5183cc56be69f48ae44090e7f672939f732
@@ -996,7 +996,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P ab0a4f44fb67e9f0cb82297b80e728ca58cdb0fb
-R ad6c9794089ec45a4e493d1d79b6555f
+P ecab2083334dcdde24a3c56864114979b7a6f25a
+R 1ee2743e0728dfd5b16085c25faca723
 U dan
-Z 8189e23423b7ab0255c97e908b40cc3e
+Z 1978b788ff30c8d67f82270e25799f6e

diff --git a/manifest.uuid b/manifest.uuid
index cbb9ac7b02c5b84240b2c9569c5400d17ebe542f..c9913b975dc717a92c36500e23af29492589ea7c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ecab2083334dcdde24a3c56864114979b7a6f25a
\ No newline at end of file
+dcb8fa0f77a44250df0e8c4f6cfb9f6e181982d7
\ No newline at end of file

diff --git a/test/fts4merge3.test b/test/fts4merge3.test
index 30ea92cc8dc7888b42a28c3c6e2bdfd2acdab559..8cd3cf250cc848a4e95e9980925cbf4710bc62ab 100644 (file)
--- a/test/fts4merge3.test
+++ b/test/fts4merge3.test
@@ -88,7 +88,7 @@ do_all_bc_test {
 
     do_test 1.15 { sql2 { 
       SELECT level, count(*) FROM t2_segdir GROUP BY level ORDER BY 1
-    } } {5 1}
+    } } {6 1}
   }
 }
 

diff --git a/test/trace2.test b/test/trace2.test
index b1a53e77b5284fa1a06e0324c1630ed9cb5eee4a..06bb01c1fc88515cbc2b30a36d309b0d217ac3a7 100644 (file)
--- a/test/trace2.test
+++ b/test/trace2.test
@@ -130,7 +130,7 @@ ifcapable fts3 {
     "INSERT INTO x1 VALUES('North northwest wind between 8 and 14 mph');" 
     "-- INSERT INTO 'main'.'x1_content' VALUES(?,(?))" 
     "-- REPLACE INTO 'main'.'x1_docsize' VALUES(?,?)" 
-    "-- SELECT value FROM 'main'.'x1_stat' WHERE id=0" 
+    "-- SELECT value FROM 'main'.'x1_stat' WHERE id=?" 
     "-- REPLACE INTO 'main'.'x1_stat' VALUES(0,?)" 
     "-- SELECT (SELECT max(idx) FROM 'main'.'x1_segdir' WHERE level = ?) + 1" 
     "-- SELECT coalesce((SELECT max(blockid) FROM 'main'.'x1_segments') + 1, 1)"