From ee908140ac723b62016e849c07cecf6241289a19 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Thu, 3 Oct 2024 17:23:50 +0300
Subject: [PATCH] Fixed bug in main.connect test where Connection_errors showed
 wrong value

---
 mysql-test/main/connect.result |  4 +++-
 mysql-test/main/connect.test   | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/mysql-test/main/connect.result b/mysql-test/main/connect.result
index fb63b2d5175..f6fd4c4b1c7 100644
--- a/mysql-test/main/connect.result
+++ b/mysql-test/main/connect.result
@@ -457,11 +457,13 @@ Connection_errors_max_connections	0
 Connection_errors_peer_address	0
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
+show global status like 'Threads_connected';
+Variable_name	Value
+Threads_connected	1
 set @max_con.save= @@max_connections;
 set global max_connections= 10;
 # ERROR 1040
 # ERROR 1040
-connection default;
 show global status like 'Connection_errors%';
 Variable_name	Value
 Connection_errors_accept	0
diff --git a/mysql-test/main/connect.test b/mysql-test/main/connect.test
index 9a121384d6e..0ed60bbacbe 100644
--- a/mysql-test/main/connect.test
+++ b/mysql-test/main/connect.test
@@ -517,6 +517,7 @@ SET GLOBAL connect_timeout= @save_connect_timeout;
 flush status;
 
 show global status like 'Connection_errors%';
+show global status like 'Threads_connected';
 
 set @max_con.save= @@max_connections;
 set global max_connections= 10;
@@ -534,9 +535,25 @@ while ($n)
   --dec $n
 }
 
+connection default;
+let $n= 10;
+let $c= 12;
+while ($n)
+{
+  disconnect con$c;
+  --dec $n
+  --dec $c
+}
+
+# Wait until all connections has terminated to ensure
+# that Connection_errors is correct
+
+let $status_var=Threads_connected;
+let $status_var_value= 1;
+--source include/wait_for_status_var.inc
+
 --enable_result_log
 --enable_query_log
---connection default
 show global status like 'Connection_errors%';
 set global max_connections= @max_con.save;