mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
MDEV-26, Global transaction ID.
Fix three more test failures seen in buildbot (one of them ported from main tree).
This commit is contained in:
parent
b7363eb4ac
commit
e5cbefeb89
3 changed files with 8 additions and 0 deletions
|
@ -111,6 +111,7 @@ PURGE BINARY LOGS TO "master-bin.000006";
|
|||
--write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
|
||||
wait-binlog_xa_recover.test
|
||||
EOF
|
||||
--error 0,2006,2013
|
||||
SET DEBUG_SYNC= "now SIGNAL con4_cont";
|
||||
connection con4;
|
||||
--error 2006,2013
|
||||
|
|
5
mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf
Normal file
5
mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf
Normal 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
|
|
@ -1,3 +1,5 @@
|
|||
--source include/not_embedded.inc
|
||||
|
||||
SET @old_gtid_pos= @@gtid_pos;
|
||||
|
||||
SET GLOBAL gtid_pos= '';
|
||||
|
|
Loading…
Reference in a new issue