From 14cb6e4235ebb84ad41d6ceb4eaf56c0b55d9238 Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Sun, 10 Aug 2014 20:28:18 +0200
Subject: Resolve shutdown crash/leak if MySQL server is not running

Fixes #12734
---
 src/server/shared/Database/MySQLConnection.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index e9fc20aef82..4e46ff0e3a1 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -57,12 +57,14 @@ m_connectionFlags(CONNECTION_ASYNC)
 
 MySQLConnection::~MySQLConnection()
 {
-    ASSERT (m_Mysql); /// MySQL context must be present at this point
-
     for (size_t i = 0; i < m_stmts.size(); ++i)
         delete m_stmts[i];
 
-    mysql_close(m_Mysql);
+    if (m_Mysql)
+        mysql_close(m_Mysql);
+
+    if (m_worker)
+        delete m_worker;
 }
 
 void MySQLConnection::Close()
-- 
cgit v1.2.3