Skip to content
/ server Public

Commit 92a4926

Browse files
committed
MDEV-36290: Mask non-deterministic test output
rpl.rpl_fragment_row_event_errs could fail because its output may show different amounts of memory needed. So mask this number in the test output. Signed-off-by: Brandon Nesterenko <[email protected]>
1 parent 6ef2894 commit 92a4926

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mysql-test/suite/rpl/r/rpl_fragment_row_event_errs.result

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ connection master;
1919
set @old_dbug= @@debug_dbug;
2020
set debug_dbug= "+d,oom_fragmenting_large_rows_ev";
2121
insert into t1 values (1, repeat("a",1536));
22-
ERROR HY001: Out of memory; restart server and try again (needed 288 bytes)
22+
ERROR HY001: Out of memory; restart server and try again (needed # bytes)
2323
set debug_dbug= @old_dbug;
2424
#
2525
#
@@ -89,7 +89,6 @@ insert into t1 values (5, repeat("a",1536));
8989
include/save_master_gtid.inc
9090
connection slave;
9191
include/wait_for_slave_sql_error.inc [errno=1037]
92-
Last_SQL_Error = 'Could not append Partial_rows_log_event 1 / 2 to internal Rows_log_event buffer: Out of memory; restart server and try again (needed 1968 bytes)'
9392
STOP SLAVE;
9493
include/wait_for_slave_to_stop.inc
9594
set @@global.debug_dbug= @old_dbug;

mysql-test/suite/rpl/t/rpl_fragment_row_event_errs.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ create table t1 (a int, b blob) engine=innodb;
3333
--connection master
3434
set @old_dbug= @@debug_dbug;
3535
set debug_dbug= "+d,oom_fragmenting_large_rows_ev";
36+
--replace_regex /needed [0-9]+ bytes/needed # bytes/
3637
--error ER_OUTOFMEMORY
3738
--eval insert into t1 values ($ins_num, repeat("a",1536))
3839
--inc $ins_num
@@ -141,7 +142,7 @@ set @@global.debug_dbug= "+d,oom_reassembling_large_rows_ev_buf";
141142

142143
--connection slave
143144
--let $slave_sql_errno=1037
144-
--let $show_slave_sql_error= 1
145+
--let $show_slave_sql_error= 0
145146
--let $slave_timeout=5
146147
--source include/wait_for_slave_sql_error.inc
147148

0 commit comments

Comments
 (0)