summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqltest.test
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2017-05-02 16:31:24 +0300
committerGitHub <noreply@github.com>2017-05-02 16:31:24 +0300
commit63e4be267b7b788e24cb564e5e2b8a7f8e0a8284 (patch)
tree0ba35636cefd0828b2f159921fda8125942f0d3f /mysql-test/t/mysqltest.test
parent2d457843d6331a9faaf13d7948880c503863c57f (diff)
parentbbef7455749e8e02ecbd006326b7fea99a99a5ad (diff)
downloadmariadb-git-63e4be267b7b788e24cb564e5e2b8a7f8e0a8284.tar.gz
Merge pull request #362 from grooverdan/10.1-MDEV-XXXX-mysqltest-replace-regex-vars
MDEV-12522: mysqltest replace regex + sys_vars.sysvars_wsrep test to be version independent
Diffstat (limited to 'mysql-test/t/mysqltest.test')
-rw-r--r--mysql-test/t/mysqltest.test4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 1e7d8a6a8ca..d1851836893 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -2082,9 +2082,11 @@ drop table t1;
--let $patt= /a /b / /less/more/
--replace_regex $patt
select "a is a and less is more" as txt;
+--replace_regex $patt /and /or /
+select "a is a and less is more" as txt2;
--let $patt=
--replace_regex $patt
-select "a is a and less is more" as txt;
+select "a is a and less is more" as txt3;
--enable_query_log
#