1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-26, Global transaction ID.

Browse Source 
Fix three more test failures seen in buildbot (one of them ported
from main tree).
This commit is contained in:
unknown 2013-04-09 11:46:38 +02:00
parent b7363eb4ac
commit e5cbefeb89
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/binlog/t/binlog_xa_recover.test
View File

@ -111,6 +111,7 @@ PURGE BINARY LOGS TO "master-bin.000006";
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
wait-binlog_xa_recover.test wait-binlog_xa_recover.test
EOF EOF
--error 0,2006,2013
SET DEBUG_SYNC= "now SIGNAL con4_cont"; SET DEBUG_SYNC= "now SIGNAL con4_cont";
connection con4; connection con4;
--error 2006,2013 --error 2006,2013

5
mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf Normal file
View File

@ -0,0 +1,5 @@
!include ../my.cnf
[mysqld.2]
# Needed because depending on load on test machine the master restart can take long.
master_retry_count = 120

2
mysql-test/suite/sys_vars/t/gtid_pos_basic.test
View File

@ -1,3 +1,5 @@
--source include/not_embedded.inc
SET @old_gtid_pos= @@gtid_pos; SET @old_gtid_pos= @@gtid_pos;
SET GLOBAL gtid_pos= ''; SET GLOBAL gtid_pos= '';