From bdc66d6b8f83256ac116a4a18a25df18f3027399 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Wed, 27 Nov 2024 07:48:27 +0100
Subject: [PATCH] Fix for CONC-703:

If connect failed and no error was set (apparently this happens
sometimes on Mac) we now set error to CR_SERVER_LOST.
---
 libmariadb/mariadb_lib.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 7d5f6241..da754b3d 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -2040,6 +2040,12 @@ error:
   if (!(client_flag & CLIENT_REMEMBER_OPTIONS) &&
       !(IS_MYSQL_ASYNC(mysql)))
     mysql_close_options(mysql);
+
+  /* CONC-703: If no error was set, we set CR_SERVER_LOST by default */
+  if (!mysql_errno(mysql))
+    my_set_error(mysql, CR_SERVER_LOST, SQLSTATE_UNKNOWN,
+                        "Can't connect to server (%d).",
+                        errno);
   return(0);
 }