From: dan <dan@noemail.net>
Date: Wed, 9 Sep 2015 08:15:06 +0000 (+0000)
Subject: Fix a bug in preprocessor macros within fts5_main.c.
X-Git-Tag: version-3.9.0~122^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f06bd2c132ac81e42e207160d5998941378ed2bf;p=thirdparty%2Fsqlite.git

Fix a bug in preprocessor macros within fts5_main.c.

FossilOrigin-Name: 0eb2b9521fad6fa36e6fa374c2bc1f70b5180f7c
---

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index 0755dcb291..2fd633bd28 100644
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -1317,7 +1317,7 @@ static int fts5SpecialInsert(
     rc = sqlite3Fts5StorageMerge(pTab->pStorage, nMerge);
   }else if( 0==sqlite3_stricmp("integrity-check", z) ){
     rc = sqlite3Fts5StorageIntegrity(pTab->pStorage);
-#ifdef SQLITE_TEST
+#ifdef SQLITE_DEBUG
   }else if( 0==sqlite3_stricmp("prefix-index", z) ){
     pConfig->bPrefixIndex = sqlite3_value_int(pVal);
 #endif
diff --git a/manifest b/manifest
index 36d5700540..3a493d4cfa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\s0x00\sterminators\sfrom\sthe\send\sof\sdoclists\sstored\son\sdisk.
-D 2015-09-08T19:55:26.385
+C Fix\sa\sbug\sin\spreprocessor\smacros\swithin\sfts5_main.c.
+D 2015-09-09T08:15:06.914
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -113,7 +113,7 @@ F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695
 F ext/fts5/fts5_expr.c 1c24e1a2ffb286bfe37e537a43b7fadabfe993d4
 F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246
 F ext/fts5/fts5_index.c 677c859b2064e00903a9ad847a1cfca8d36ce595
-F ext/fts5/fts5_main.c 3ec19f23693e034028afb9b4fa7c800dc3eda5ab
+F ext/fts5/fts5_main.c 4b04c934084ea24a858438a04b5be8af3a9e0311
 F ext/fts5/fts5_storage.c 120f7b143688b5b7710dacbd48cff211609b8059
 F ext/fts5/fts5_tcl.c 6da58d6e8f42a93c4486b5ba9b187a7f995dee37
 F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
@@ -1384,7 +1384,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 67ff5ae81357eb7fa28049bb724a22cb6f52e076
-R 7e6723f8162dfa594f88012bb5737a33
+P 00d990061dec3661b0376bd167082942d5563bfe
+R 9536c4653d5903bd9893d3d3b5a1950d
 U dan
-Z 0d6a020581263053b4291f892521bd3c
+Z 248c3a89f7d69902ace7cabd0e5d1724
diff --git a/manifest.uuid b/manifest.uuid
index 55934271fe..355df4f8f3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-00d990061dec3661b0376bd167082942d5563bfe
\ No newline at end of file
+0eb2b9521fad6fa36e6fa374c2bc1f70b5180f7c
\ No newline at end of file