From d807e41511c92a1497f8550fdee6557eb856218a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org>
Date: Tue, 17 Jan 2017 00:37:20 +0200
Subject: [PATCH] Post merge fix sysvars_innodb for xtradb

---
 mysql-test/suite/sys_vars/t/sysvars_innodb.test | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysql-test/suite/sys_vars/t/sysvars_innodb.test b/mysql-test/suite/sys_vars/t/sysvars_innodb.test
index bd8442b6a4438..8faa9bce31ae5 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