From 946ab3e8b71ad106c7e75fd78b96d70865b29d79 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 21 Jul 2014 18:13:48 +0200 Subject: Core: Kill again whitespace :( --- src/server/shared/Database/PreparedStatement.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/shared/Database') diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index fb1bfa687d0..be5591667be 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -447,7 +447,7 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern //- Execution PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, bool async) : m_stmt(stmt) -{ +{ m_has_result = async; // If it's async, then there's a result if (async) m_result = new PreparedQueryResultPromise(); -- cgit v1.2.3 From eae97c7bc897e021a000111e6579183fe123a333 Mon Sep 17 00:00:00 2001 From: Sebastian Valle Herrera Date: Mon, 21 Jul 2014 13:01:11 -0500 Subject: Core/PreparedStatements: Fixed a Coverity warning --- src/server/shared/Database/PreparedStatement.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/shared/Database') diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index be5591667be..23c50ac2ef8 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -446,7 +446,7 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern //- Execution PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, bool async) : -m_stmt(stmt) +m_stmt(stmt), m_result(nullptr) { m_has_result = async; // If it's async, then there's a result if (async) -- cgit v1.2.3 From 5b0898b33cd6e928d51df003d1ab2b781ee92fbd Mon Sep 17 00:00:00 2001 From: leak Date: Mon, 21 Jul 2014 20:12:20 +0200 Subject: Core/DatabaseWorkerPool: Delete PCQ in dtor rather than in Close() and cancel queue properly before doing so --- src/server/shared/Database/DatabaseWorkerPool.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/shared/Database') diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index f0b540022da..a1ee6407fea 100644 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -59,6 +59,11 @@ class DatabaseWorkerPool ~DatabaseWorkerPool() { + _queue->Cancel(); + + delete _queue; + + delete _connectionInfo; } bool Open(const std::string& infoString, uint8 async_threads, uint8 synch_threads) @@ -122,12 +127,7 @@ class DatabaseWorkerPool for (uint8 i = 0; i < _connectionCount[IDX_SYNCH]; ++i) _connections[IDX_SYNCH][i]->Close(); - delete _queue; - TC_LOG_INFO("sql.driver", "All connections on DatabasePool '%s' closed.", GetDatabaseName()); - - delete _connectionInfo; - _connectionInfo = NULL; } /** -- cgit v1.2.3