From 47df0ba17c60a451a3cea477b841b92d69bb0cbc Mon Sep 17 00:00:00 2001 From: Dave Gosselin Date: Tue, 9 Sep 2025 11:34:32 -0400 Subject: [PATCH] Cherry-pick of 'mariadb-test: wait on disconnect' from 12.1 Cherry-picks mysqltest.cc and rpl_semi_sync_shutdown_await_ack changes from 12.1 to fix a race condition on disconnect. --- client/mysqltest.cc | 6 +++++- .../suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 57368654ec9..a7e42b3f5e6 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -5767,8 +5767,12 @@ void do_close_connection(struct st_command *command) DBUG_PRINT("info", ("Closing connection %s", con->name)); #ifndef EMBEDDED_LIBRARY if (command->type == Q_DIRTY_CLOSE) - { mariadb_cancel(con->mysql); + else + { + simple_command(con->mysql,COM_QUIT,0,0,0); + if (con->util_mysql) + simple_command(con->util_mysql,COM_QUIT,0,0,0); } #endif /*!EMBEDDED_LIBRARY*/ if (con->stmt) diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test b/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test index 906cddc9971..a6d3d51cf94 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test @@ -219,7 +219,7 @@ SET GLOBAL debug_dbug="+d,simulate_delay_semisync_slave_reply"; --connection server_2 set debug_sync= "now wait_for io_thd_at_slave_reply"; ---disconnect con1 +--dirty_close con1 --connection default --write_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect