From ccdf2025b5f50c8b734c372f71f88f246e1087bd Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 30 Mar 2012 13:34:17 +0000 Subject: [PATCH] Fix an FTS4 test script problem for windows. FossilOrigin-Name: 36aa6665e709b5942b3558afbd555058b42f2c78 --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fts4merge3.test | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 29878944a9..0881a2a23e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\sname\sof\sa\slocal\svariable\sfrom\s"not"\sto\s"bNot"\sto\slessen\sthe\nchances\sof\sit\scolliding\swith\ssome\sprior\s#define\sin\sthe\sappliation. -D 2012-03-30T12:10:38.151 +C Fix\san\sFTS4\stest\sscript\sproblem\sfor\swindows. +D 2012-03-30T13:34:17.656 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -502,7 +502,7 @@ F test/fts4content.test 17b2360f7d1a9a7e5aa8022783f5c5731b6dfd4f F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7 F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891 -F test/fts4merge3.test 7ca2225996f6c4e12efbd4fe34ce8a805adecfb2 +F test/fts4merge3.test 640611c05f01e9e018ac10afd188b018d8fcd4e5 F test/func.test 9809b7622d721904a8cc33c1ffb87f46d506ed01 F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a @@ -999,7 +999,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P fa82062c659ffbe7ad01106d3ef54d7bb44f1f44 -R e9f2b9678dec950221629d45134c94ac +P cbdd86387630600b309de4aaeaa131ec7b053ce2 +R 88f6eca232fcd821cd715bbadb803c37 U drh -Z d33972f4357f472f3903792c8f2dee06 +Z a41a68a88bffc936799088c08283176f diff --git a/manifest.uuid b/manifest.uuid index ee70dc167e..03525e8dd3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cbdd86387630600b309de4aaeaa131ec7b053ce2 \ No newline at end of file +36aa6665e709b5942b3558afbd555058b42f2c78 \ No newline at end of file diff --git a/test/fts4merge3.test b/test/fts4merge3.test index 86b44e5eee..d591329fb0 100644 --- a/test/fts4merge3.test +++ b/test/fts4merge3.test @@ -25,6 +25,7 @@ if {"" == [bc_find_binaries backcompat.test]} { return } +db close do_all_bc_test { sql2 { PRAGMA page_size = 512 }