Fix an error in an fts5 test script.

FossilOrigin-Name: b2a03e2d479aec2fc68dfc83a1fa34c740f44e13

diff --git a/ext/fts5/test/fts5_common.tcl b/ext/fts5/test/fts5_common.tcl
index 93a8bab806f84c5bfcdff0ab58cb592076a14e25..32691d1c81f754b491323bc5da70ab63d6ae5eaa 100644 (file)
--- a/ext/fts5/test/fts5_common.tcl
+++ b/ext/fts5/test/fts5_common.tcl
@@ -21,6 +21,8 @@ ifcapable !fts5 {
     return -code return
   }
   return
+} else {
+  proc return_if_no_fts5 {} {}
 }
 
 catch { 

diff --git a/ext/fts5/test/fts5merge2.test b/ext/fts5/test/fts5merge2.test
index cd515cc29eeb0f5034666d400512c1894b6852b4..0d3fad8b085961a70841eaff872cdb6671f1b06c 100644 (file)
--- a/ext/fts5/test/fts5merge2.test
+++ b/ext/fts5/test/fts5merge2.test
@@ -27,8 +27,6 @@ proc dump_structure {} {
 
 foreach_detail_mode $testprefix {
 
-if {[detail_is_none]==0} continue
-
 do_execsql_test 1.0 {
   CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL%);
   INSERT INTO t1(t1, rank) VALUES('pgsz', 32);

diff --git a/manifest b/manifest
index 9293374902c0eccc8692e12fe7000f8514b4152d..2738351d63ad635b11a7a02b49cbfb4bea3065c3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\srun\sfts5bigtok.test\sor\sfts5merge2.test\sif\sFTS5\sis\snot\scompiled\sin.
-D 2016-03-01T16:56:26.421
+C Fix\san\serror\sin\san\sfts5\stest\sscript.
+D 2016-03-02T13:26:19.396
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 56ea123a975690bf9ed38b31bb89ff87b02a7c2b
@@ -116,7 +116,7 @@ F ext/fts5/fts5_varint.c a5aceacda04dafcbae725413d7a16818ecd65738
 F ext/fts5/fts5_vocab.c dba72ca393d71c2588548b51380387f6b44c77a8
 F ext/fts5/fts5parse.y 59432ea369f1aa65511bad465f55d31a22f9f223
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
-F ext/fts5/test/fts5_common.tcl fbbf457b1433151789a006f9f94c00780a5e3f78
+F ext/fts5/test/fts5_common.tcl b9b1fed811c0390511cef8b254826ea15d380f4d
 F ext/fts5/test/fts5aa.test 7e814df4a0e6c22a6fe2d84f210fdc0b5068a084
 F ext/fts5/test/fts5ab.test 30325a89453280160106be411bba3acf138e6d1b
 F ext/fts5/test/fts5ac.test 55cad4275a1f5acabfe14d8442a8046b47e49e5f
@@ -162,7 +162,7 @@ F ext/fts5/test/fts5hash.test 06f9309ccb4d5050a131594e9e47d0b21456837d
 F ext/fts5/test/fts5integrity.test f5e4f8d284385875068ad0f3e894ce43e9de835d
 F ext/fts5/test/fts5matchinfo.test 86569026d20f1ed748236587ce798de8a96615f1
 F ext/fts5/test/fts5merge.test 8f3cdba2ec9c5e7e568246e81b700ad37f764367
-F ext/fts5/test/fts5merge2.test 8faa829aa3238a25a200200b54780a9bd5d97c14
+F ext/fts5/test/fts5merge2.test a6da3c16d694235938d1939f503cfa53f0943d75
 F ext/fts5/test/fts5near.test b214cddb1c1f1bddf45c75af768f20145f7e71cc
 F ext/fts5/test/fts5onepass.test 7ed9608e258132cb8d55e7c479b08676ad68810c
 F ext/fts5/test/fts5optimize.test 42741e7c085ee0a1276140a752d4407d97c2c9f5
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3cee93716f2aece03bf9b835fb7b5294e4ddc176
-R ea05f03539d26243966fe5b0665aa396
+P f7ed373953c2dea0919a85dfb461dfef512cd5fc
+R fb67c5bfcdd18aefee22c2054e345c4e
 U dan
-Z 26014b2cea95bca862f77aab9147f990
+Z 0301af39ef437e67ac6a081e34e72ea7

diff --git a/manifest.uuid b/manifest.uuid
index 670de7851feed424480838a58cc722b69896d0a6..6bb6c19871893b5493f9775b84274901badfbc4a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f7ed373953c2dea0919a85dfb461dfef512cd5fc
\ No newline at end of file
+b2a03e2d479aec2fc68dfc83a1fa34c740f44e13
\ No newline at end of file