diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-14 13:45:52 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-08-14 13:45:52 -0400 |
| commit | fe757e006c676bc1cfb713f26fbd43e608531458 (patch) | |
| tree | da1fa78d8ea806c9eddb522681cfb6495f5a336b /mysql-test | |
| parent | c18e0dab8a24db9d8f84fef328c27a28939a6ef5 (diff) | |
| download | mariadb-git-fe757e006c676bc1cfb713f26fbd43e608531458.tar.gz | |
Fix for some failing tests.mariadb-galera-5.5.45
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/innodb_load_xa_with_wsrep.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera/suite.pm | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_uninstall.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/suite.pm | 2 | ||||
| -rw-r--r-- | mysql-test/t/innodb_load_xa_with_wsrep.test | 3 |
5 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/r/innodb_load_xa_with_wsrep.result b/mysql-test/r/innodb_load_xa_with_wsrep.result index 6064dcd22d3..8b1e48bb8ca 100644 --- a/mysql-test/r/innodb_load_xa_with_wsrep.result +++ b/mysql-test/r/innodb_load_xa_with_wsrep.result @@ -16,3 +16,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 index 03bb2e85e81..d0147fd6309 100644 --- 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\)|, ); diff --git a/mysql-test/suite/innodb/r/innodb_uninstall.result b/mysql-test/suite/innodb/r/innodb_uninstall.result index 2064269a02e..d0270c1cf3e 100644 --- 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 index 33744a60ad8..1dbe1630a1b 100644 --- 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 index 413faf54864..6755d209a02 100644 --- 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 + |