Merge 10.3 into 10.4

2025-08-08 11:22:35 +03:00 · 2018-12-08 00:12:55 +02:00
parent ce8716a1ed 2fd0acd30f
commit a80f5fdbd1
2 changed files with 10 additions and 9 deletions
--- a/mysql-test/suite/rpl/t/rpl_gtid_crash.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_crash.test
@@ -186,6 +186,7 @@ EOF
 wait
 EOF
 START SLAVE;
+--error 0,2006,2013
 SET GLOBAL debug_dbug="+d,crash_commit_after";

 --connection server_1