From a8434c6c59e291b65f1e294cafa4555470c3094c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 2 Jun 2021 08:25:12 +0300 Subject: [PATCH 1/2] MDEV-25730 fixup: GCC -Og -Wmaybe-uninitialized Silence a warning about an uninitialized variable that was introduced by commit d8fa71a089aa5cbe569e7f8b6fa67326a9ecab2b. --- sql/sql_admin.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 3fa00b81f2e..41af1e22de6 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -515,6 +515,7 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables, if (thd->check_killed()) { + open_error= false; fatal_error= true; result_code= HA_ADMIN_FAILED; goto send_result; From 4847a2e730877f00971f10de3e2656d2b418fac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 2 Jun 2021 08:28:48 +0300 Subject: [PATCH 2/2] MDEV-17749 fixup: ./mtr --embedded main.lock_kill --- mysql-test/main/lock_kill.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/lock_kill.test b/mysql-test/main/lock_kill.test index d0b83fe1413..dfeebbc4f6a 100644 --- a/mysql-test/main/lock_kill.test +++ b/mysql-test/main/lock_kill.test @@ -17,7 +17,7 @@ LOCK TABLE t1 WRITE; eval KILL $conid; --enable_query_log --connection con1 ---error 0,2013 +--error 0,2013,ER_CONNECTION_KILLED reap; --connection default --disconnect con1 @@ -35,7 +35,7 @@ LOCK TABLE t1 WRITE, t2 WRITE; eval KILL $conid; --enable_query_log --connection con1 ---error 0,2013 +--error 0,2013,ER_CONNECTION_KILLED reap; --connection default --disconnect con1