From: dan <dan@noemail.net>
Date: Fri, 23 Mar 2012 14:38:49 +0000 (+0000)
Subject: Remove an incorrect assert() statement. Fix a const-related warning.
X-Git-Tag: mountain-lion~3^2~9^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3501a916774fcc3f071b36d284f52b5bb33bf942;p=thirdparty%2Fsqlite.git

Remove an incorrect assert() statement. Fix a const-related warning.

FossilOrigin-Name: 96ed47493b3d46344fd2105642f31690aee06674
---

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 5b8fcc2ab2..e755c53cc6 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -3285,7 +3285,6 @@ static int fts3IncrmergeCsr(
   int nByte;                      /* Bytes allocated at pCsr->apSegment[] */
 
   /* Allocate space for the Fts3MultiSegReader.aCsr[] array */
-  assert( nSeg>=2 );
   memset(pCsr, 0, sizeof(*pCsr));
   nByte = sizeof(Fts3SegReader *) * nSeg;
   pCsr->apSegment = (Fts3SegReader **)sqlite3_malloc(nByte);
@@ -4389,7 +4388,7 @@ static int fts3IncrmergeHintLoad(
   if( rc==SQLITE_OK ){
     sqlite3_bind_int(pSelect, 1, FTS_STAT_INCRMERGEHINT);
     if( SQLITE_ROW==sqlite3_step(pSelect) ){
-      char *aHint = sqlite3_column_blob(pSelect, 0);
+      const char *aHint = sqlite3_column_blob(pSelect, 0);
       int nHint = sqlite3_column_bytes(pSelect, 0);
       if( aHint ){
         int i;
diff --git a/manifest b/manifest
index 0c849c6500..23ef80f398 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\stest\scase\sissue\sin\strace2.test.
-D 2012-03-23T13:40:59.728
+C Remove\san\sincorrect\sassert()\sstatement.\sFix\sa\sconst-related\swarning.
+D 2012-03-23T14:38:49.144
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -78,7 +78,7 @@ F ext/fts3/fts3_test.c 6b7cc68aef4efb084e1449f7d20c4b20d3bdf6b4
 F ext/fts3/fts3_tokenizer.c 3da7254a9881f7e270ab28e2004e0d22b3212bce
 F ext/fts3/fts3_tokenizer.h 66dec98e365854b6cd2d54f1a96bb6d428fc5a68
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
-F ext/fts3/fts3_write.c 62ada731e3beef4977386a91240c5f80a1db884e
+F ext/fts3/fts3_write.c 8791a3dae9d1433261800e7d36208d3e88ffa5bc
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
@@ -498,7 +498,7 @@ F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
 F test/fts4aa.test 6e7f90420b837b2c685f3bcbe84c868492d40a68
 F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
-F test/fts4merge.test 663607bef5575027295d0b7168370ccd0bae6522
+F test/fts4merge.test 7cea27240f68596bc1b02117409d34a3f7e8c3ec
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
 F test/fts4merge3.test e0e21332f592fc003fcab112928ea891407d83cb
 F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
@@ -997,7 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 82c3f2ba42f2c75ba6951cc2743148886a4dc0bc
-R 8a1a17690cd4174645797512470efb7b
+P 02a8e4236cf2c1c74b3c6537be1b5f197175a32e
+R 83c8ccbccee5d73d8055d59ab542cc92
 U dan
-Z 4882f51212a5dac4b2ac7a10dc446a83
+Z 9064fda8da51ce4c65bcaaf3383b8b6d
diff --git a/manifest.uuid b/manifest.uuid
index c786337c25..e3a12a140a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-02a8e4236cf2c1c74b3c6537be1b5f197175a32e
\ No newline at end of file
+96ed47493b3d46344fd2105642f31690aee06674
\ No newline at end of file
diff --git a/test/fts4merge.test b/test/fts4merge.test
index 5d3368e528..887888f899 100644
--- a/test/fts4merge.test
+++ b/test/fts4merge.test
@@ -162,6 +162,7 @@ do_execsql_test 4.4.2 {
   SELECT level, group_concat(idx, ' ') FROM t4_segdir GROUP BY level;
 } "0 {0 1 2 3 4 5}                     1 0"
 
+
 #-------------------------------------------------------------------------
 # Test cases 5.*
 #
@@ -255,5 +256,35 @@ do_execsql_test 5.11 {
   X'0000'
 }
 
+#-------------------------------------------------------------------------
+# Test cases 6.*
+#
+# At one point the following test caused an assert() to fail (because the
+# second 'merge=1,2' operation below actually "merges" a single input
+# segment, which was unexpected).
+#
+do_test 6.1 {
+  reset_db
+  set a [string repeat a 900]
+  set b [string repeat b 900]
+  set c [string repeat c 900]
+  set d [string repeat d 900]
+  execsql {
+    CREATE VIRTUAL TABLE t1 USING fts4;
+    BEGIN;
+      INSERT INTO t1 VALUES($a);
+      INSERT INTO t1 VALUES($b);
+    COMMIT;
+    BEGIN;
+      INSERT INTO t1 VALUES($c);
+      INSERT INTO t1 VALUES($d);
+    COMMIT;
+  }
+
+  execsql {
+    INSERT INTO t1(t1) VALUES('merge=1,2');
+    INSERT INTO t1(t1) VALUES('merge=1,2');
+  }
+} {}
 
 finish_test