From 6755944d0876e15aab0d2d33e1d7db1327f0ef8f Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 30 Aug 2013 11:25:49 +0200 Subject: remove PBXT --- mysql-test/t/mysqld--help.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/t/mysqld--help.test') diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test index 4b5572c2bbe..a41d79fa145 100644 --- a/mysql-test/t/mysqld--help.test +++ b/mysql-test/t/mysqld--help.test @@ -26,7 +26,7 @@ perl; @plugins=qw/innodb ndb archive blackhole federated partition ndbcluster feedback debug temp-pool ssl des-key-file xtradb thread-concurrency super-large-pages - mutex-deadlock-detector null-audit maria aria pbxt oqgraph + mutex-deadlock-detector null-audit maria aria oqgraph sphinx thread-handling thread-pool query-cache-info/; # And substitute the content some environment variables with their -- cgit v1.2.1 From d042e61f8e68f24897b88c6ff5ab213aa1eb59fd Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 11 Nov 2013 09:31:02 +0100 Subject: MDEV-5054 Failing test(s): main.mysqld--help sys_vars.character_sets_dir_basic fix tests where a path was used as a regex. revert changes to sys_vars.character_sets_dir_basic - we don't run it on windows anyway --- mysql-test/t/mysqld--help.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/t/mysqld--help.test') diff --git a/mysql-test/t/mysqld--help.test b/mysql-test/t/mysqld--help.test index a41d79fa145..5f61b4b7c43 100644 --- a/mysql-test/t/mysqld--help.test +++ b/mysql-test/t/mysqld--help.test @@ -53,7 +53,7 @@ perl; s/\b2146435072\b/9223372036853727232/; s/\b196608\b/262144/; s/\b4294963200\b/18446744073709547520/; - foreach $var (@env) { s/$ENV{$var}/$var/ } + foreach $var (@env) { s/\Q$ENV{$var}\E/$var/ } next if /use --skip-(use-)?symbolic-links to disable/; # for valgrind, again next if $skip; print; -- cgit v1.2.1