diff options
Diffstat (limited to 'src/server/shared/Database')
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/QueryResult.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/SQLOperation.cpp | 4 | ||||
| -rw-r--r-- | src/server/shared/Database/Transaction.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 6da629b395e..9fe720bf1d1 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -31,9 +31,9 @@ #include "Timer.h" MySQLConnection::MySQLConnection() : -m_Mysql(NULL), +m_queue(NULL), m_worker(NULL), -m_queue(NULL) +m_Mysql(NULL) { } diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp index 8b0c437b066..dfcb3a94acd 100644 --- a/src/server/shared/Database/QueryResult.cpp +++ b/src/server/shared/Database/QueryResult.cpp @@ -21,9 +21,9 @@ #include "DatabaseEnv.h" QueryResult::QueryResult(MYSQL_RES *result, MYSQL_FIELD *fields, uint64 rowCount, uint32 fieldCount) -: mResult(result) -, mFieldCount(fieldCount) +: mFieldCount(fieldCount) , mRowCount(rowCount) +, mResult(result) { mCurrentRow = new Field[mFieldCount]; ASSERT(mCurrentRow); diff --git a/src/server/shared/Database/SQLOperation.cpp b/src/server/shared/Database/SQLOperation.cpp index 25da4344c14..b524e962544 100644 --- a/src/server/shared/Database/SQLOperation.cpp +++ b/src/server/shared/Database/SQLOperation.cpp @@ -29,8 +29,8 @@ m_has_result(false) } BasicStatementTask::BasicStatementTask(const char* sql, QueryResultFuture result) : -m_result(result), -m_has_result(true) +m_has_result(true), +m_result(result) { m_sql = strdup(sql); } diff --git a/src/server/shared/Database/Transaction.cpp b/src/server/shared/Database/Transaction.cpp index e9c5d4aeebd..c535afbc542 100644 --- a/src/server/shared/Database/Transaction.cpp +++ b/src/server/shared/Database/Transaction.cpp @@ -29,7 +29,7 @@ void Transaction::PAppend(const char* sql, ...) va_list ap; char szQuery [MAX_QUERY_LEN]; va_start(ap, sql); - int res = vsnprintf(szQuery, MAX_QUERY_LEN, sql, ap); + vsnprintf(szQuery, MAX_QUERY_LEN, sql, ap); va_end(ap); Append(szQuery); |
