diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-05-02 16:31:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 16:31:24 +0300 |
| commit | 63e4be267b7b788e24cb564e5e2b8a7f8e0a8284 (patch) | |
| tree | 0ba35636cefd0828b2f159921fda8125942f0d3f /mysql-test/r/mysqltest.result | |
| parent | 2d457843d6331a9faaf13d7948880c503863c57f (diff) | |
| parent | bbef7455749e8e02ecbd006326b7fea99a99a5ad (diff) | |
| download | mariadb-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/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index fa054d457f9..dcb28baa18d 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -672,7 +672,9 @@ drop table t1; y txt b is b and more is more -txt +txt2 +b is b or more is more +txt3 a is a and less is more sflfdt 'ABCDfF bbddff h' bs txt; txt |