summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog_encryption
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-11-12 16:55:44 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-11-12 16:55:44 +0200
commit33cb10d4e9793d1b6800be22e8eb9ceffdd8af4a (patch)
tree19de2029cc51b44d05e2253681ec6e8cf8d229c6 /mysql-test/suite/binlog_encryption
parente5f99a0c0ccbb6cbf4a816fed552af9c20cc32e9 (diff)
parent5098d708a07f90484c9e13fe3ab58113a8a10191 (diff)
downloadmariadb-git-33cb10d4e9793d1b6800be22e8eb9ceffdd8af4a.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/binlog_encryption')
-rw-r--r--mysql-test/suite/binlog_encryption/rpl_corruption.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog_encryption/rpl_corruption.result b/mysql-test/suite/binlog_encryption/rpl_corruption.result
index 14a67b3a3a5..25a82fd60cd 100644
--- a/mysql-test/suite/binlog_encryption/rpl_corruption.result
+++ b/mysql-test/suite/binlog_encryption/rpl_corruption.result
@@ -30,7 +30,7 @@ SET GLOBAL master_verify_checksum=0;
SET GLOBAL debug_dbug="+d,corrupt_read_log_event2_set";
connection slave;
START SLAVE IO_THREAD;
-include/wait_for_slave_io_error.inc [errno=1595,1913]
+include/wait_for_slave_io_error.inc [errno=1595,1743]
connection master;
SET GLOBAL debug_dbug="-d,corrupt_read_log_event2_set";
SET GLOBAL debug_dbug= "";
@@ -39,7 +39,7 @@ SET GLOBAL master_verify_checksum=1;
connection slave;
SET GLOBAL debug_dbug="+d,corrupt_queue_event";
START SLAVE IO_THREAD;
-include/wait_for_slave_io_error.inc [errno=1595,1913]
+include/wait_for_slave_io_error.inc [errno=1595,1743]
SET GLOBAL debug_dbug="-d,corrupt_queue_event";
# 6. Slave. Corruption in relay log
SET GLOBAL debug_dbug="+d,corrupt_read_log_event_char";