summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/t
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-02-11 09:45:34 +0100
committerSergei Golubchik <serg@mariadb.org>2017-02-11 09:45:34 +0100
commitf3914d10b61eb4bc4184b2a9aa92a998e1abd779 (patch)
tree0f973c0dc2fb1f667ed852e4177b17938e28b6b9 /mysql-test/suite/sys_vars/t
parent559345806216369bad999539018bd3943860a5d5 (diff)
parent2195bb4e416232ab807ff67eecf03b1223bf6bff (diff)
downloadmariadb-git-f3914d10b61eb4bc4184b2a9aa92a998e1abd779.tar.gz
Merge branch 'bb-10.2-serg-merge' into 10.2
Diffstat (limited to 'mysql-test/suite/sys_vars/t')
-rw-r--r--mysql-test/suite/sys_vars/t/sysvars_innodb.test5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/t/sysvars_innodb.test b/mysql-test/suite/sys_vars/t/sysvars_innodb.test
index 38f248cb611..2abafda34c6 100644
--- a/mysql-test/suite/sys_vars/t/sysvars_innodb.test
+++ b/mysql-test/suite/sys_vars/t/sysvars_innodb.test
@@ -3,6 +3,11 @@
--source include/not_valgrind.inc
--source include/word_size.inc
+if (`select plugin_auth_version <= "5.6.34-79.1" from information_schema.plugins where plugin_name='innodb'`)
+{
+ --skip Not fixed in XtraDB as of 10.1.21-MariaDB or earlier
+}
+
--vertical_results
--replace_regex /^\/\S+/PATH/ /\.\//PATH/
select * from information_schema.system_variables