Skip to content

Commit 16190d2

Browse files
ParadoxV5grooverdan
authored andcommitted
Sort output of binlog_mysqlbinlog_warn_stop_gtid
Hash tables don’t have a specific ordering to avoid the overhead of tracking the order. But consequentially, the output of this test from MDEV-34614 may be in a different order – notably, in big-endian platforms like S390x. This patch adds `--sort_result` to affected test cases to overcome this difference without changing the code.
1 parent b1829ff commit 16190d2

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

mysql-test/suite/binlog/t/binlog_mysqlbinlog_warn_stop_position.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ if (!$read_from_remote_server)
5252
--echo # file should(!) result in a warning
5353
--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --short-form --stop-position=binlog_f1_over_eof binlog_f1_full --result-file=$binlog_out_relpath 2>&1
5454
--replace_result $binlog_f1_over_eof <BINLOG_F1_OVER_EOF>
55+
--sorted_result
5556
--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --short-form --stop-position=$binlog_f1_over_eof $binlog_f1_full --result-file=$binlog_out 2>&1
5657

5758
--echo #
@@ -101,6 +102,7 @@ if (!$read_from_remote_server)
101102
--echo # 2) not prevent b2 from outputting its entire binary log
102103
--echo # MYSQL_BINLOG $PARAM_READ_FROM_REMOTE_OUT --stop-position=binlog_f2_over_eof binlog_f1_full binlog_f2_full --result-file=$binlog_out_relpath 2>&1
103104
--replace_result $binlog_f2_over_eof <BINLOG_F2_OVER_EOF>
105+
--sorted_result
104106
--exec $MYSQL_BINLOG $PARAM_READ_FROM_REMOTE --stop-position=$binlog_f2_over_eof $binlog_f1_full $binlog_f2_full --result-file=$binlog_out 2>&1
105107

106108
--let $server_id= `SELECT @@GLOBAL.server_id`

0 commit comments

Comments
 (0)