aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2013-02-08 23:06:00 +0000
committerNay <dnpd.dd@gmail.com>2013-02-08 23:06:25 +0000
commitf902362ad1fb5681305a9eaac14e1c0ec55449e9 (patch)
treedd0442d3d2f08164aaae86f74464595700d44696 /src
parent8066e43dd8a51a314b6ace8cf0b0282c36bdeadd (diff)
Core/DBLayer: Avoid a crash when calling mysql_get_server_version if connection was not open
Diffstat (limited to 'src')
-rw-r--r--src/server/shared/Database/DatabaseWorkerPool.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index 9f93e99ab26..fa02b1d369a 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -77,7 +77,8 @@ class DatabaseWorkerPool
{
T* t = new T(_queue, _connectionInfo);
res &= t->Open();
- WPFatal (mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "TrinityCore does not support MySQL versions below 5.1");
+ if (res) // only check mysql version if connection is valid
+ WPFatal(mysql_get_server_version(t->GetHandle()) >= MIN_MYSQL_SERVER_VERSION, "TrinityCore does not support MySQL versions below 5.1");
_connections[IDX_ASYNC][i] = t;
++_connectionCount[IDX_ASYNC];
}