database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Enable the binlog_in_engine mtr suite in Windows Buildbot

Browse Source 
Reviewed-by: Brandon Nesterenko <brandon.nesterenko@mariadb.com>
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2026-08-28 04:44:34 +02:00
parent fd9d7c9c1c
commit e9f84a1fdf
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/collections/buildbot_suites.bat
View File

@@ -3,6 +3,7 @@ perl mysql-test-run.pl --force --suite-timeout=120 --max-test-fail=10 --retry=3
vcol,gcol,period,perfschema,parts,^
main,^
innodb,^
binlog_in_engine,^
versioning,^
plugins,^
mariabackup,^

6
mysql-test/suite/binlog_in_engine/mariabackup_binlog_dir.test
View File

@@ -17,7 +17,11 @@ flush binary logs;
--let $binlog_size= 262144
--source include/wait_for_engine_binlog.inc
--exec $XTRABACKUP --backup --target-dir=$MYSQL_TMP_DIR/mbackup --socket=$MASTER_MYSOCK --user=root --binlog-directory=backup_binlogs > $MYSQL_TMP_DIR/mbackup.log 2>&1
let $port_or_socket=--socket=$MASTER_MYSOCK;
if ($MARIADB_UPGRADE_EXE) { # windows
let $port_or_socket=--port=$MASTER_MYPORT;
}
--exec $XTRABACKUP --backup --target-dir=$MYSQL_TMP_DIR/mbackup $port_or_socket --user=root --binlog-directory=backup_binlogs > $MYSQL_TMP_DIR/mbackup.log 2>&1
--exec $XTRABACKUP --prepare --target-dir=$MYSQL_TMP_DIR/mbackup > $MYSQL_TMP_DIR/mprepare.log 2>&1
--exec $XTRABACKUP --copy-back --target-dir=$MYSQL_TMP_DIR/mbackup --binlog-directory=binlogs --datadir=$MYSQL_TMP_DIR/mcopyback > $MYSQL_TMP_DIR/mcopyback.log 2>&1
# The bug was a missing slash, so the binlogs would be in mcopybackbinlogs/

2
mysql-test/suite/binlog_in_engine/rpl_out_of_order_gtid.result
View File

@@ -38,7 +38,7 @@ DROP TABLE t2_slave;
SET GLOBAL gtid_strict_mode= @old_strict;
CALL mtr.add_suppression('Slave: ORDER BY ignored');
CALL mtr.add_suppression('Slave: An attempt was made to binlog GTID .* which would create an out-of-order sequence number with existing GTID');
CALL mtr.add_suppression('Slave: Error writing file .*"Unknown error 1950"');
CALL mtr.add_suppression('Slave: Error writing file .* 1950');
SET GLOBAL slave_parallel_threads= @old_parallel;
include/start_slave.inc
connection master;

2
mysql-test/suite/binlog_in_engine/rpl_out_of_order_gtid.test
View File

@@ -57,7 +57,7 @@ DROP TABLE t2_slave;
SET GLOBAL gtid_strict_mode= @old_strict;
CALL mtr.add_suppression('Slave: ORDER BY ignored');
CALL mtr.add_suppression('Slave: An attempt was made to binlog GTID .* which would create an out-of-order sequence number with existing GTID');
CALL mtr.add_suppression('Slave: Error writing file .*"Unknown error 1950"');
CALL mtr.add_suppression('Slave: Error writing file .* 1950');
SET GLOBAL slave_parallel_threads= @old_parallel;
--source include/start_slave.inc