diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-22 18:31:04 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-22 18:31:04 -0400 |
commit | ab4947463e68da1a01bd506f8f280ebdea3f1b46 (patch) | |
tree | 75ec757acf0955e19d1fac0f3fcac2a6593e0a2f /mysql-test/include/mtr_check.sql | |
parent | 0bf3ed12a5338f0db4b652f839fee93a28d39195 (diff) | |
download | mariadb-git-ab4947463e68da1a01bd506f8f280ebdea3f1b46.tar.gz |
Merging changes from maria-5.5-galera and
some test fixes.
bzr merge -r3479..3493 maria-5.5-galera
Diffstat (limited to 'mysql-test/include/mtr_check.sql')
-rw-r--r-- | mysql-test/include/mtr_check.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index e34e32ad1a6..edc15850d97 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -34,6 +34,7 @@ BEGIN AND variable_name != 'INNODB_USE_NATIVE_AIO' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' + AND variable_name != 'WSREP_DATA_HOME_DIR' ORDER BY variable_name; -- Dump all databases, there should be none |