Check-in [87a6a9970b] did not completely disable FTS4. This check-in aims

to finish the job.

FossilOrigin-Name: 0259b6299e435b3c3a7ca33df8c38c8a5dc84a61

diff --git a/manifest b/manifest
index 02dc35db2c073ae9a4b36c05cdd343639e7cd226..399cdd1dae4cbfa361752879a4f38a99fa1c94c1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Version\s3.6.23\srelease\scandidate\s2
-D 2010-03-09T12:35:50
+C Check-in\s[87a6a9970b]\sdid\snot\scompletely\sdisable\sFTS4.\s\sThis\scheck-in\saims\nto\sfinish\sthe\sjob.
+D 2010-03-09T13:02:09
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -118,7 +118,7 @@ F src/btreeInt.h 71ed5e7f009caf17b7dc304350b3cb64b5970135
 F src/build.c 11100b66fb97638d2d874c1d34d8db90650bb1d7
 F src/callback.c 908f3e0172c3d4058f4ca0acd42c637c52e9669f
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
-F src/ctime.c ceb247eb31620bba66a94c3f697db489a1652353
+F src/ctime.c 675186d89e0e6c028390b6c75d5356beffb669d4
 F src/date.c 485a4409a384310e6d93fd1104a9d0a8658becd9
 F src/delete.c 610dc008e88a9599f905f5cbe9577ac9c36e0581
 F src/expr.c 6baed2a0448d494233d9c0a610eea018ab386a32
@@ -413,7 +413,7 @@ F test/fts3near.test 2e318ee434d32babd27c167142e2b94ddbab4844
 F test/fts3query.test 154fe4b015fd61af523ee083570a134f508f5be7
 F test/fts3rnd.test 2f5761db9dd92f6fe09d08976ac658ef521846ed
 F test/fts3snippet.test 9f9a4a7e396c5d8ce2898be65ebabc429555430f
-F test/fts4aa.test 9a9bc506487399c17284fa82a72f16d5ced2910c
+F test/fts4aa.test eadf85621c0a113d4c7ad3ccbf8441130e007b8f
 F test/func.test 6c5ce11e3a0021ca3c0649234e2d4454c89110ca
 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
 F test/fuzz.test a4174c3009a3e2c2e14b31b364ebf7ddb49de2c9
@@ -795,14 +795,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 87a6a9970b8cea25fc5f8ff03d87762dd1166899
-R 1fcfb960d20a15b8470efbc87dfb021d
+P 73f4d292dc66ac41456f2ebddada82c7f5633431
+R 3cdf85b053e7d2c29d535ebbf31f6037
 U drh
-Z 6db52ba17428ec753946fe0b8a5bc8e9
+Z 8ef848802a5e0f9292743403e01b6176
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLlkCqoxKgR168RlERAua6AJ94QPf2FUP7qgK82iSuLnClDx/K+QCfSIGg
-iw4R4+v+WhFPtZR1FCnvj/M=
-=li0r
+iD8DBQFLlkbVoxKgR168RlERAo9sAJ9Eq1E0sFN98AYAhn0EnJGVqh04egCdFFEg
+Vp667gjbizejMCwpzbRquto=
+=E1Ez
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index f586fcf1cb2db3ede9382972711e7ee7b7e3f9ea..6ecacec815e191d944acbe1f6b40e82397f47a77 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-73f4d292dc66ac41456f2ebddada82c7f5633431
\ No newline at end of file
+0259b6299e435b3c3a7ca33df8c38c8a5dc84a61
\ No newline at end of file

diff --git a/src/ctime.c b/src/ctime.c
index dacdc5883cfcec95a5f83d117da2b5e534c60d26..ed91ddf66336a0dc31d49aa141bb017808c47dc7 100644 (file)
--- a/src/ctime.c
+++ b/src/ctime.c
@@ -84,9 +84,11 @@ static const char * const azCompileOpt[] = {
 #ifdef SQLITE_ENABLE_FTS3_PARENTHESIS
   "ENABLE_FTS3_PARENTHESIS",
 #endif
+#if 0 /* Disabled because FTS4 is not ready for publication */
 #ifdef SQLITE_ENABLE_FTS4
   "ENABLE_FTS4",
 #endif
+#endif
 #ifdef SQLITE_ENABLE_ICU
   "ENABLE_ICU",
 #endif

diff --git a/test/fts4aa.test b/test/fts4aa.test
index 2b6d071ca9150705180b32e2d19baa1e35fe75b8..c6fa3b9cd4693a7a3a840fbae5ac2ba242cbbb8e 100644 (file)
--- a/test/fts4aa.test
+++ b/test/fts4aa.test
@@ -21,6 +21,10 @@ ifcapable !fts3 {
   finish_test
   return
 }
+if {[db eval {SELECT sqlite_compileoption_used('ENABLE_FTS4')}]==0} {
+  finish_test
+  return
+}
 
 do_test fts4aa-1.0 {
 db eval {