Merging changes from maria-5.5-galera and

some test fixes.

bzr merge -r3479..3493 maria-5.5-galera

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