database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fix for some failing tests.

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-08-14 13:45:52 -04:00
parent c18e0dab8a
commit fe757e006c
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/innodb_load_xa_with_wsrep.result
View File

@@ -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

2
mysql-test/suite/galera/suite.pm
View File

@@ -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\)|,
);

4
mysql-test/suite/innodb/r/innodb_uninstall.result
View File

@@ -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;

2
mysql-test/suite/wsrep/suite.pm
View File

@@ -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}";

3
mysql-test/t/innodb_load_xa_with_wsrep.test
View File

@@ -17,3 +17,6 @@ commit;
--source include/show_binlog_events.inc
drop table t1;
uninstall plugin innodb;
--source include/restart_mysqld.inc