Fix a harmless compiler warning in tclsqlite.c for MSVC x64. Fix a test

case associated with the FTS4 merge feature.

FossilOrigin-Name: de3f7187eb2ff24683a1854ae523e7d30c290893

diff --git a/manifest b/manifest
index ddca71d490f2520908d7fc9be0bf8606a00adab7..4cb6899a8321ad4285f04feefbcc6d0b91fc5e04 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\s(unused\sparameter\swarnings)\sin\sthe\saggregate\nquery\sanalyzer.
-D 2012-04-19T15:49:19.250
+C Fix\sa\sharmless\scompiler\swarning\sin\stclsqlite.c\sfor\sMSVC\sx64.\s\sFix\sa\stest\ncase\sassociated\swith\sthe\sFTS4\smerge\sfeature.
+D 2012-04-19T17:19:51.813
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -189,7 +189,7 @@ F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
-F src/tclsqlite.c 086dfdd72e5892de223968a258e1ccbd9693e717
+F src/tclsqlite.c c936d7e673e6bd8b00a704afe52eb4dc9227e819
 F src/test1.c 8631f728c9c3afcf79e3e22b510e451435e3d15e
 F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
 F src/test3.c f82399ec50d9cd7378bf9d6db6c1409d5e77b042
@@ -502,7 +502,7 @@ F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
-F test/fts4merge3.test 125c3334f49bc171b3310efc99358cd05475c1d6
+F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7
 F test/func.test 9809b7622d721904a8cc33c1ffb87f46d506ed01
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
@@ -1000,7 +1000,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 6015200beb3be7ec141ce36de694278e3ba11a02
-R 9257b7e12fe23b672785f7fcab3d866f
+P 2d43562084316ec180a4c2cfc3fee08d58432204
+R b4d15b45430ec8317ad8235bfccc7422
 U drh
-Z 56d6ab47e198788c5ca35282ff366bc4
+Z 90af5bda362fb4ffad168e2931647669

diff --git a/manifest.uuid b/manifest.uuid
index 366c76a5aa535f6b26d4fc516c36d0e20cb56efc..55713ed71a69ebf8ba515c648b8e3078b48d94a5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2d43562084316ec180a4c2cfc3fee08d58432204
\ No newline at end of file
+de3f7187eb2ff24683a1854ae523e7d30c290893
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 9161088e08dd00d9b9cab211b53889db09cd42fb..e1ae8eb8ed55ea482a84486ab8b70fca90bafd88 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -1163,7 +1163,7 @@ static int dbPrepareAndBind(
     memset(pPreStmt, 0, nByte);
 
     pPreStmt->pStmt = pStmt;
-    pPreStmt->nSql = (*pzOut - zSql);
+    pPreStmt->nSql = (int)(*pzOut - zSql);
     pPreStmt->zSql = sqlite3_sql(pStmt);
     pPreStmt->apParm = (Tcl_Obj **)&pPreStmt[1];
 #ifdef SQLITE_TEST

diff --git a/test/fts4merge3.test b/test/fts4merge3.test
index 3fd300daf96e3764cdeea00be2927a974f523f01..329b4d2cc4ea97720f5b52079af03654d2c17f59 100644 (file)
--- a/test/fts4merge3.test
+++ b/test/fts4merge3.test
@@ -44,7 +44,10 @@ do_all_bc_test {
     do_test 1.2 { sql1 "SELECT docid FROM t2 WHERE t2 MATCH 'abc'" } {1485}
     do_test 1.3 { sql2 "SELECT docid FROM t2 WHERE t2 MATCH 'abc'" } {1485}
 
-    do_test 1.4 { sql2 "PRAGMA page_count" } {1286}
+    do_test 1.4 {
+      set x [sql2 "PRAGMA page_count"]
+      expr {$x>=1284 && $x<=1286}
+    } {1}
     do_test 1.5 { sql2 { 
       SELECT level, count(*) FROM t2_segdir GROUP BY level ORDER BY 1
     } } [list 0 15    1 1     2 14    3 4]