From: dan <Dan Kennedy>
Date: Tue, 6 Apr 2021 17:51:18 +0000 (+0000)
Subject: Fix issue with failing --enable-debug --enable-fts5 build.
X-Git-Tag: version-3.36.0~248
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d73ade7d8717cf829cc30bc9592167b9819c52e2;p=thirdparty%2Fsqlite.git

Fix issue with failing --enable-debug --enable-fts5 build.

FossilOrigin-Name: e7491acc0c93b7b0b5a27130d956bb23f876b90ced11cdd416a86727af076ee1
---

diff --git a/Makefile.in b/Makefile.in
index ec624077c4..981263921a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -432,8 +432,7 @@ TESTSRC = \
   $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_test.c  \
   $(TOP)/ext/session/test_session.c \
-  $(TOP)/ext/rbu/test_rbu.c \
-  fts5.c
+  $(TOP)/ext/rbu/test_rbu.c 
 
 # Statically linked extensions
 #
@@ -522,7 +521,8 @@ TESTSRC2 = \
   $(TOP)/ext/fts3/fts3_write.c \
   $(TOP)/ext/async/sqlite3async.c \
   $(TOP)/ext/session/sqlite3session.c \
-  $(TOP)/ext/misc/stmt.c
+  $(TOP)/ext/misc/stmt.c \
+  fts5.c
 
 # Header files used by all library source files.
 #
diff --git a/Makefile.msc b/Makefile.msc
index 7792481916..3068815fb2 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1552,8 +1552,7 @@ TESTSRC = \
   $(TOP)\ext\fts3\fts3_term.c \
   $(TOP)\ext\fts3\fts3_test.c \
   $(TOP)\ext\rbu\test_rbu.c \
-  $(TOP)\ext\session\test_session.c \
-  fts5.c
+  $(TOP)\ext\session\test_session.c 
 
 # Statically linked extensions.
 #
@@ -1586,7 +1585,8 @@ TESTEXT = \
   $(TOP)\ext\misc\spellfix.c \
   $(TOP)\ext\misc\totype.c \
   $(TOP)\ext\misc\unionvtab.c \
-  $(TOP)\ext\misc\wholenumber.c
+  $(TOP)\ext\misc\wholenumber.c \
+  fts5.c
 
 # If use of zlib is enabled, add the "zipfile.c" source file.
 #
diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 8c5f2683b7..fa9c731f1a 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -6226,6 +6226,7 @@ int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum, int bUseCksum){
 ** function only.
 */
 
+#ifdef SQLITE_TEST
 /*
 ** Decode a segment-data rowid from the %_data table. This function is
 ** the opposite of macro FTS5_SEGMENT_ROWID().
@@ -6248,7 +6249,9 @@ static void fts5DecodeRowid(
 
   *piSegid = (int)(iRowid & (((i64)1 << FTS5_DATA_ID_B) - 1));
 }
+#endif /* SQLITE_TEST */
 
+#ifdef SQLITE_TEST
 static void fts5DebugRowid(int *pRc, Fts5Buffer *pBuf, i64 iKey){
   int iSegid, iHeight, iPgno, bDlidx;       /* Rowid compenents */
   fts5DecodeRowid(iKey, &iSegid, &bDlidx, &iHeight, &iPgno);
@@ -6266,7 +6269,9 @@ static void fts5DebugRowid(int *pRc, Fts5Buffer *pBuf, i64 iKey){
     );
   }
 }
+#endif /* SQLITE_TEST */
 
+#ifdef SQLITE_TEST
 static void fts5DebugStructure(
   int *pRc,                       /* IN/OUT: error code */
   Fts5Buffer *pBuf,
@@ -6288,6 +6293,7 @@ static void fts5DebugStructure(
     sqlite3Fts5BufferAppendPrintf(pRc, pBuf, "}");
   }
 }
+#endif /* SQLITE_TEST */
 
 #ifdef SQLITE_TEST
 /*
diff --git a/main.mk b/main.mk
index db3010db7b..43b956a122 100644
--- a/main.mk
+++ b/main.mk
@@ -386,8 +386,7 @@ TESTSRC += \
   $(TOP)/ext/misc/zipfile.c \
   $(TOP)/ext/fts5/fts5_tcl.c \
   $(TOP)/ext/fts5/fts5_test_mi.c \
-  $(TOP)/ext/fts5/fts5_test_tok.c \
-  fts5.c
+  $(TOP)/ext/fts5/fts5_test_tok.c
 
 
 #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
@@ -440,7 +439,8 @@ TESTSRC2 = \
   $(TOP)/ext/async/sqlite3async.c \
   $(TOP)/ext/misc/stmt.c \
   $(TOP)/ext/session/sqlite3session.c \
-  $(TOP)/ext/session/test_session.c
+  $(TOP)/ext/session/test_session.c \
+  fts5.c
 
 # Header files used by all library source files.
 #
diff --git a/manifest b/manifest
index 0bb48892a7..987b8c49a6 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C New\stest\scases\sadded\sto\sfuzzdata8.db.
-D 2021-04-06T16:55:30.363
+C Fix\sissue\swith\sfailing\s--enable-debug\s--enable-fts5\sbuild.
+D 2021-04-06T17:51:18.096
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in fff6189595902d0b8b980ec934b31f3f5849125fe8b295786ea776755fdf42a3
+F Makefile.in 3f76d8a9b0e78aa7b627ad56cab35908d99909de51dcb90b1e6a29eb4fd4394a
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc 22cb82798644b43981731ca4802e29787b59a3d418d6efc06f81a84e4a749bfd
+F Makefile.msc 231cf3fbc7bab3cc1801b3bf6a006098e9dfeca00d4d0910aad74795d0f94d5f
 F README.md 2a71913f398ecac5f3e10945fcf438aed425c2e9ed9874de561156ba77fb7023
 F VERSION 8c392f6d70d82e513a0eac622bdf23c43df3e084cb630288beba8cef3012c812
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -119,7 +119,7 @@ F ext/fts5/fts5_buffer.c 5a5fe0159752c0fb0a5a93c722e9db2662822709490769d482b76a6
 F ext/fts5/fts5_config.c be54f44fca491e96c6923a4b9a736f2da2b13811600eb6e38d1bcc91c4ea2e61
 F ext/fts5/fts5_expr.c 016bd06030679bd31b0f07ef87d62c42031e5da25cb3174a84e5b0f6ef4b47b0
 F ext/fts5/fts5_hash.c 1aa93c9b5f461afba66701ee226297dc78402b3bdde81e90a10de5fe3df14959
-F ext/fts5/fts5_index.c 39e026ac85f9ad0239e03e7fb690990d03794552eb594657ea5a9f797e62a6f0
+F ext/fts5/fts5_index.c 27c83f0ca4f97b5f525014f277d15262ffbccdf8153b92919fd1b9035d23f0b1
 F ext/fts5/fts5_main.c f497ca97cb2802311ec93733b595762dc5b044ce3c6c8ce5fb3e871dd3fccd5d
 F ext/fts5/fts5_storage.c 58ba71e6cd3d43a5735815e7956ee167babb4d2cbfe206905174792af4d09d75
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
@@ -464,7 +464,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk e25274304ca6850d266f1ff3ac40b67fc7ce13313201b6bac2f68ed3a591bd79
+F main.mk 71abdbb39dbc530f436f7095d2c0504140d513142a6a552602fb55c8156fd854
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1912,7 +1912,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f64deecee1691cf21b4f3d27d8490ecc8eae65cf26df7a22f8d15317f0cecd5b
-R c04eebace688fd50895558489ff071fd
-U drh
-Z 464bbc6a91b9b7a3573d69d9236cc7e3
+P 039ad662dd899048da04238c05b8cf384323f6e8c1087b96428ea9e20726c8c0
+R fd5cd36547c0a7147f46afa7704df88b
+U dan
+Z c1640ce900c187750f4a20f59117f4c7
diff --git a/manifest.uuid b/manifest.uuid
index e10f81f234..3f56ccfcd5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-039ad662dd899048da04238c05b8cf384323f6e8c1087b96428ea9e20726c8c0
\ No newline at end of file
+e7491acc0c93b7b0b5a27130d956bb23f876b90ced11cdd416a86727af076ee1
\ No newline at end of file