Merge branch '5.5-galera' into 10.0-galera

MariaDB · Aug 14, 2015 · c6a0cbd · c6a0cbd
2 parents 5cf737c + fe757e0
commit c6a0cbd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/mysql-test/r/innodb_load_xa_with_wsrep.result b/mysql-test/r/innodb_load_xa_with_wsrep.result
@@ -17,3 +17,5 @@ mysqld-bin.000001	#	Query	#	#	use `test`; insert t1 values (2)
 mysqld-bin.000001	#	Xid	#	#	COMMIT /* XID */
 drop table t1;
 uninstall plugin innodb;
+Warnings:
+Warning	1620	Plugin is busy and will be uninstalled on shutdown
diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm
@@ -33,7 +33,7 @@ push @::global_suppressions,
      qr(WSREP: last inactive check more than .* skipping check),
      qr(WSREP: SQL statement was ineffective),
      qr(WSREP: Releasing seqno [0-9]* before [0-9]* was assigned.),
-     qr|WSREP: access file\(gvwstate.dat\) failed\(No such file or directory\)|,
+     qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
      qr(WSREP: Quorum: No node with complete state),
      qr(WSREP: Initial position was provided by configuration or SST, avoiding override),
      qr|WSREP: discarding established \(time wait\) .*|,

diff --git a/mysql-test/suite/innodb/r/innodb_uninstall.result b/mysql-test/suite/innodb/r/innodb_uninstall.result
@@ -1,4 +1,6 @@
 install plugin innodb soname 'ha_innodb';
+Warnings:
+Warning	1105	Cannot enable tc-log at run-time. XA features of InnoDB are disabled
 create table t1(a int not null primary key) engine=innodb;
 begin;
 insert into t1 values(1);
@@ -11,6 +13,8 @@ Warnings:
 Warning	1620	Plugin is busy and will be uninstalled on shutdown
 drop table t1;
 install plugin innodb soname 'ha_innodb';
+Warnings:
+Warning	1105	Cannot enable tc-log at run-time. XA features of InnoDB are disabled
 create table t2(a int not null primary key) engine=innodb;
 insert into t2 values(1);
 drop table t2;

diff --git a/mysql-test/suite/wsrep/suite.pm b/mysql-test/suite/wsrep/suite.pm
@@ -27,7 +27,7 @@ push @::global_suppressions,
      qr(WSREP: Could not open saved state file for reading: ),
      qr(WSREP: option --wsrep-casual-reads is deprecated),
      qr(WSREP: --wsrep-casual-reads=ON takes precedence over --wsrep-sync-wait=0),
-     qr|WSREP: access file\(gvwstate.dat\) failed\(No such file or directory\)|,
+     qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
    );
 
 $ENV{PATH}="$epath:$ENV{PATH}";

diff --git a/mysql-test/t/innodb_load_xa_with_wsrep.test b/mysql-test/t/innodb_load_xa_with_wsrep.test
@@ -17,3 +17,6 @@ commit;
 --source include/show_binlog_events.inc
 drop table t1;
 uninstall plugin innodb;
+
+--source include/restart_mysqld.inc
+