Before running each test script, make sure the FTS enhanced query syntax is disabled.

FossilOrigin-Name: f84d87bcc0e4f6f56d01556b2b1dc27ebef9ce26

diff --git a/manifest b/manifest
index 50e37752e19b6cd444fb370d2a90d7a1ed983a25..36cfd7d06451e9623b4892e19bd83b0ee6d296ab 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sregexp\sresult\soption\sfor\sa\stest\scase\sin\sshell1.test.
-D 2012-05-12T01:14:27.949
+C Before\srunning\seach\stest\sscript,\smake\ssure\sthe\sFTS\senhanced\squery\ssyntax\sis\sdisabled.
+D 2012-05-12T05:30:29.959
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -726,7 +726,7 @@ F test/tclsqlite.test 1597d353308531527583481d14d9da52ea8ed0af
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
-F test/tester.tcl 17b5f402d0e60e8c8ce751288b228fe9337f40c2
+F test/tester.tcl a55e066251bc05e26f9da00e76644ab649b26f3c
 F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -768,7 +768,7 @@ F test/tkt-b1d3a2e531.test 610ef582413171b379652663111b1f996d9f8f78
 F test/tkt-b351d95f9.test d14a503c414c5c58fdde3e80f9a3cfef986498c0
 F test/tkt-b72787b1.test a95e8cdad0b98af1853ac7f0afd4ab27b77bf5f3
 F test/tkt-bd484a090c.test 60460bf946f79a79712b71f202eda501ca99b898
-F test/tkt-bdc6bbbb38.test 1ec1c8e0fd0d294dc5d6de1a65eab8bb1b565ebf
+F test/tkt-bdc6bbbb38.test fc38bb09bdd440e3513a1f5f98fc60a075182d7d
 F test/tkt-c48d99d690.test bed446e3513ae10eec1b86fdd186ef750226c408
 F test/tkt-cbd054fa6b.test bd9fb546f63bc0c79d1776978d059fa51c5b1c63
 F test/tkt-d11f09d36e.test fb44f7961aa6d4b632fb7b9768239832210b5fc7
@@ -997,7 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 22eef1d8a81ea95612f7973e242fa333c51ae399
-R 74df4c06a278cd6025933ea00b52e97f
-U drh
-Z 88b1427b1537909fafe38797c50a931e
+P 93061c6e063fddfa6b5d21064a36b58cc97599f1
+R 1266fdc6649c7c37fc945bf3a68e25cb
+U dan
+Z efae0d0fc97871bb7b1020786a272a5c

diff --git a/manifest.uuid b/manifest.uuid
index df44d64f74135505e371ae303f8036bf1e2dd3f5..beee1a4763cc1bd03332e76d923bf3c10ab22eda 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-93061c6e063fddfa6b5d21064a36b58cc97599f1
\ No newline at end of file
+f84d87bcc0e4f6f56d01556b2b1dc27ebef9ce26
\ No newline at end of file

diff --git a/test/tester.tcl b/test/tester.tcl
index 71100a2e6e491c602beb6d045d836d1bf0b276d7..07eebcbf5f04d767fe274dad62f96f6a36b4352d 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -1614,5 +1614,8 @@ proc db_delete_and_reopen {{file test.db}} {
 # to non-zero, then set the global variable $AUTOVACUUM to 1.
 set AUTOVACUUM $sqlite_options(default_autovacuum)
 
+# Make sure the FTS enhanced query syntax is disabled.
+set sqlite_fts3_enable_parentheses 0
+
 source $testdir/thread_common.tcl
 source $testdir/malloc_common.tcl

diff --git a/test/tkt-bdc6bbbb38.test b/test/tkt-bdc6bbbb38.test
index 3c76f7aa120b04db40509825df41ebc61e9380fa..8b0d55df84c2d1ff96699288ad47e26f3f2a807e 100644 (file)
--- a/test/tkt-bdc6bbbb38.test
+++ b/test/tkt-bdc6bbbb38.test
@@ -86,4 +86,5 @@ foreach {tn idxdir} {1 ASC 2 DESC} {
   }
 }
 
+set sqlite_fts3_enable_parentheses 0
 finish_test