From 6aba5a07eabc1fefa001f8fae189c1a77f642aba Mon Sep 17 00:00:00 2001 From: Dmitry Shulga Date: Fri, 11 Jun 2021 13:01:15 +0700 Subject: MDEV-16708: more test failures fixed (added --enable_prepared_warnings/--disable_prepared_warnings) --- mysql-test/suite/rpl/t/rpl_heartbeat.test | 3 +++ mysql-test/suite/rpl/t/rpl_heartbeat_basic.test | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat.test b/mysql-test/suite/rpl/t/rpl_heartbeat.test index 77c05a60c0a..e4753b7be07 100644 --- a/mysql-test/suite/rpl/t/rpl_heartbeat.test +++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test @@ -21,6 +21,7 @@ set @restore_slave_net_timeout= @@global.slave_net_timeout; set @@global.slave_net_timeout= 10; --enable_warnings +--enable_prepare_warnings ### ### Checking the range ### @@ -167,6 +168,8 @@ drop table t1; sync_slave_with_master; set @@global.slave_net_timeout= @restore_slave_net_timeout; +--disable_prepare_warnings + --source include/stop_slave.inc --echo End of tests diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test index f12c5921ba2..45b5d48c13b 100644 --- a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test +++ b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test @@ -18,6 +18,8 @@ --source include/have_binlog_format_mixed.inc --echo +--enable_prepare_warnings + # Set number of retries to connect to master let $connect_retry= 20; @@ -561,5 +563,7 @@ DROP TABLE t1; --sync_slave_with_master SET @@global.slave_net_timeout=@restore_slave_net_timeout; +--disable_prepare_warnings + #--let $rpl_only_running_threads= 1 --source include/rpl_end.inc -- cgit v1.2.1