Merge remote-tracking branch 'upstream/master' into SpellMasks_0

1 files changed, 5 insertions, 1 deletions

diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 7332cb3ec01..c6d2a165ca2 100755
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -520,7 +520,11 @@ bool MySQLConnection::_HandleMySQLErrno(uint32 errNo)
             ACE_OS::sleep(10);
             std::abort();
             return false;
-
+        case ER_PARSE_ERROR:
+            sLog->outError(LOG_FILTER_SQL, "Error while parsing SQL. Core fix required.");
+            ACE_OS::sleep(10);
+            std::abort();
+            return false;
         default:
             sLog->outError(LOG_FILTER_SQL, "Unhandled MySQL errno %u. Unexpected behaviour possible.", errNo);
             return false;