Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 4e46ff0e3a1..abdf2a2cc3c 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -57,14 +57,14 @@ m_connectionFlags(CONNECTION_ASYNC)
 
 MySQLConnection::~MySQLConnection()
 {
+    if (m_worker)
+        delete m_worker;
+
     for (size_t i = 0; i < m_stmts.size(); ++i)
         delete m_stmts[i];
 
     if (m_Mysql)
         mysql_close(m_Mysql);
-
-    if (m_worker)
-        delete m_worker;
 }
 
 void MySQLConnection::Close()