From d37a8ea038136324550341b524bb6403d2456363 Mon Sep 17 00:00:00 2001
From: Giacomo Pozzoni <giacomopoz@gmail.com>
Date: Fri, 12 Apr 2019 08:08:57 +0200
Subject: Core/Database: Close the MySQL connection only after getting the last
 error code

(cherry picked from commit 3230ca74d21517204bb785e9ec799d995295ad28)
---
 src/server/database/Database/MySQLConnection.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/server/database/Database/MySQLConnection.cpp')

diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp
index b4c61517b8a..32c10725e2f 100644
--- a/src/server/database/Database/MySQLConnection.cpp
+++ b/src/server/database/Database/MySQLConnection.cpp
@@ -154,8 +154,9 @@ uint32 MySQLConnection::Open()
     else
     {
         TC_LOG_ERROR("sql.sql", "Could not connect to MySQL database at %s: %s", m_connectionInfo.host.c_str(), mysql_error(mysqlInit));
+        uint32 errorCode = mysql_errno(mysqlInit);
         mysql_close(mysqlInit);
-        return mysql_errno(mysqlInit);
+        return errorCode;
     }
 }
 
-- 
cgit v1.2.3