summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl
diff options
context:
space:
mode:
authorSujatha <sujatha.sivakumar@mariadb.com>2020-05-20 21:15:43 +0530
committerSujatha <sujatha.sivakumar@mariadb.com>2020-05-20 21:15:43 +0530
commitce1c6dab3a960a77eceafe30a1442bd64e728d31 (patch)
tree43cc8170daf0cf9668c37155a22fac551a546967 /mysql-test/suite/rpl
parentb8e694a314b538b8bebec03a78b6df6570bd608b (diff)
parentc7cdd049b58177acd163a89960e97fa308d95198 (diff)
downloadmariadb-git-ce1c6dab3a960a77eceafe30a1442bd64e728d31.tar.gz
MDEV-22451: SIGSEGV in __memmove_avx_unaligned_erms/memcpy from _my_b_write on CREATE after RESET MASTER
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/rpl')
-rw-r--r--mysql-test/suite/rpl/include/rpl_binlog_errors.inc1
-rw-r--r--mysql-test/suite/rpl/r/rpl_binlog_errors.result1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/include/rpl_binlog_errors.inc b/mysql-test/suite/rpl/include/rpl_binlog_errors.inc
index 7dd09ad1a24..bf92736a2af 100644
--- a/mysql-test/suite/rpl/include/rpl_binlog_errors.inc
+++ b/mysql-test/suite/rpl/include/rpl_binlog_errors.inc
@@ -49,6 +49,7 @@
call mtr.add_suppression("Can't generate a unique log-filename");
call mtr.add_suppression("Writing one row to the row-based binary log failed.*");
call mtr.add_suppression("Error writing file .*");
+call mtr.add_suppression("Could not use master-bin for logging");
SET @old_debug= @@global.debug_dbug;
diff --git a/mysql-test/suite/rpl/r/rpl_binlog_errors.result b/mysql-test/suite/rpl/r/rpl_binlog_errors.result
index c8a10577517..4c667bd7f5a 100644
--- a/mysql-test/suite/rpl/r/rpl_binlog_errors.result
+++ b/mysql-test/suite/rpl/r/rpl_binlog_errors.result
@@ -9,6 +9,7 @@ connection master;
call mtr.add_suppression("Can't generate a unique log-filename");
call mtr.add_suppression("Writing one row to the row-based binary log failed.*");
call mtr.add_suppression("Error writing file .*");
+call mtr.add_suppression("Could not use master-bin for logging");
SET @old_debug= @@global.debug_dbug;
SELECT repeat('x',8192) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data';
SELECT repeat('x',10) INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug_46166-2.data';