diff options
Diffstat (limited to 'src/server/shared/Database')
| -rw-r--r-- | src/server/shared/Database/DatabaseWorkerPool.h | 14 | ||||
| -rw-r--r-- | src/server/shared/Database/Implementation/LoginDatabase.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Database/PreparedStatement.h | 2 | ||||
| -rw-r--r-- | src/server/shared/Database/QueryResult.cpp | 24 | ||||
| -rwxr-xr-x | src/server/shared/Database/QueryResult.h | 6 | ||||
| -rw-r--r-- | src/server/shared/Database/Transaction.h | 2 |
7 files changed, 26 insertions, 26 deletions
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h index f7e899eae0c..cd7974a3397 100644 --- a/src/server/shared/Database/DatabaseWorkerPool.h +++ b/src/server/shared/Database/DatabaseWorkerPool.h @@ -66,7 +66,7 @@ class DatabaseWorkerPool bool Open(const std::string& infoString, uint8 num_threads, MySQLThreadBundle mask) { - //- Only created bundled connection if configured + //- Only created bundled connection if configured m_bundle_conn = NULL; if (mask != MYSQL_BUNDLE_NONE) { @@ -96,13 +96,13 @@ class DatabaseWorkerPool sLog.outSQLDriver("Closing down %u connections on this DatabaseWorkerPool", (uint32)m_connections.value()); /// Shuts down worker threads for this connection pool. m_queue->queue()->deactivate(); - + for (uint8 i = 0; i < m_async_connections.size(); i++) { m_async_connections[i]->m_worker->wait(); --m_connections; } - + if (m_bundleMask != MYSQL_BUNDLE_NONE) { delete m_bundle_conn; @@ -242,7 +242,7 @@ class DatabaseWorkerPool Enqueue(task); return res; //! Fool compiler, has no use yet } - + SQLTransaction BeginTransaction() { return SQLTransaction(new Transaction); @@ -286,7 +286,7 @@ class DatabaseWorkerPool delete[] buf; } - MySQLThreadBundle GetBundleMask() { return m_bundleMask; } + MySQLThreadBundle GetBundleMask() { return m_bundleMask; } PreparedQueryResult Query(PreparedStatement* stmt) { @@ -305,7 +305,7 @@ class DatabaseWorkerPool return 0; return (mysql_real_escape_string(GetConnection()->GetHandle(), to, from, length)); } - + void Enqueue(SQLOperation* op) { m_queue->enqueue(op); @@ -334,7 +334,7 @@ class DatabaseWorkerPool ConnectionMap m_sync_connections; //! Holds a mysql connection+thread per mapUpdate thread and unbundled runnnables. ACE_Thread_Mutex m_connectionMap_mtx; //! For thread safe access to the synchroneous connection map T* m_bundle_conn; //! Bundled connection (see Database.ThreadBundleMask config) - AtomicUInt m_connections; //! Counter of MySQL connections; + AtomicUInt m_connections; //! Counter of MySQL connections; std::string m_infoString; //! Infostring that is passed on to child connections. MySQLThreadBundle m_bundleMask; //! Our configured bundle mask (see enum) }; diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp index 1f6c5ec126b..7cf7e30b0f6 100644 --- a/src/server/shared/Database/Implementation/LoginDatabase.cpp +++ b/src/server/shared/Database/Implementation/LoginDatabase.cpp @@ -22,7 +22,7 @@ bool LoginDatabaseConnection::Open(const std::string& infoString) { if (!MySQLConnection::Open(infoString)) return false; - + m_stmts.resize(MAX_LOGINDATABASE_STATEMENTS); /* diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 51cf3ada1c8..cf47eb1374d 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -198,7 +198,7 @@ bool MySQLConnection::Execute(PreparedStatement* stmt) ASSERT(m_mStmt); // Can only be null if preparation failed, server side error or bad query m_mStmt->m_stmt = stmt; // Cross reference them for debug output stmt->m_stmt = m_mStmt; // TODO: Cleaner way - + stmt->BindParameters(); MYSQL_STMT* msql_STMT = m_mStmt->GetSTMT(); diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h index 534c6043a47..ad95789102b 100644 --- a/src/server/shared/Database/PreparedStatement.h +++ b/src/server/shared/Database/PreparedStatement.h @@ -117,7 +117,7 @@ class MySQLPreparedStatement void setInt64(const uint8 index, const int64 value); void setDouble(const uint8 index, const double value); void setString(const uint8 index, const char* value); - + protected: MYSQL_STMT* GetSTMT() { return m_Mstmt; } MYSQL_BIND* GetBind() { return m_bind; } diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp index 88f8206a3bf..93c685e0447 100644 --- a/src/server/shared/Database/QueryResult.cpp +++ b/src/server/shared/Database/QueryResult.cpp @@ -129,7 +129,7 @@ void ResultBind::BindResult(uint32& num_rows) sLog.outSQLDriver("%s:mysql_stmt_store_result, cannot bind result from MySQL server. Error: %s", __FUNCTION__, mysql_stmt_error(m_stmt)); return; } - + //- This is where we prepare the buffer based on metadata uint32 i = 0; MYSQL_FIELD* field; @@ -147,17 +147,17 @@ void ResultBind::BindResult(uint32& num_rows) m_rBind[i].is_null = &m_isNull[i]; m_rBind[i].error = NULL; m_rBind[i].is_unsigned = field->flags & UNSIGNED_FLAG; - + ++i; } - + //- This is where we bind the bind the buffer to the statement if (mysql_stmt_bind_result(m_stmt, m_rBind)) { sLog.outSQLDriver("%s:mysql_stmt_bind_result, cannot bind result from MySQL server. Error: %s", __FUNCTION__, mysql_stmt_error(m_stmt)); return; } - + num_rows = mysql_stmt_num_rows(m_stmt); } @@ -181,7 +181,7 @@ void ResultBind::CleanUp() uint8 PreparedResultSet::GetUInt8(uint32 index) { if (!CheckFieldIndex(index)) - return 0; + return 0; return *reinterpret_cast<uint8*>(rbind->m_rBind[index].buffer); } @@ -189,7 +189,7 @@ uint8 PreparedResultSet::GetUInt8(uint32 index) int8 PreparedResultSet::GetInt8(uint32 index) { if (!CheckFieldIndex(index)) - return 0; + return 0; return *reinterpret_cast<int8*>(rbind->m_rBind[index].buffer); } @@ -197,7 +197,7 @@ int8 PreparedResultSet::GetInt8(uint32 index) uint16 PreparedResultSet::GetUInt16(uint32 index) { if (!CheckFieldIndex(index)) - return 0; + return 0; return *reinterpret_cast<uint16*>(rbind->m_rBind[index].buffer); } @@ -205,7 +205,7 @@ uint16 PreparedResultSet::GetUInt16(uint32 index) int16 PreparedResultSet::GetInt16(uint32 index) { if (!CheckFieldIndex(index)) - return 0; + return 0; return *reinterpret_cast<int16*>(rbind->m_rBind[index].buffer); } @@ -213,7 +213,7 @@ int16 PreparedResultSet::GetInt16(uint32 index) uint32 PreparedResultSet::GetUInt32(uint32 index) { if (!CheckFieldIndex(index)) - return 0; + return 0; return *reinterpret_cast<uint32*>(rbind->m_rBind[index].buffer); } @@ -221,7 +221,7 @@ uint32 PreparedResultSet::GetUInt32(uint32 index) int32 PreparedResultSet::GetInt32(uint32 index) { if (!CheckFieldIndex(index)) - return 0; + return 0; return *reinterpret_cast<int32*>(rbind->m_rBind[index].buffer); } @@ -229,7 +229,7 @@ int32 PreparedResultSet::GetInt32(uint32 index) float PreparedResultSet::GetFloat(uint32 index) { if (!CheckFieldIndex(index)) - return 0; + return 0; return *reinterpret_cast<float*>(rbind->m_rBind[index].buffer); } @@ -248,7 +248,7 @@ bool PreparedResultSet::NextRow() return false; int retval = mysql_stmt_fetch( rbind->m_stmt ); - + if (!retval || retval == MYSQL_DATA_TRUNCATED) retval = true; diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h index a8fdde894ff..7a503869cb1 100755 --- a/src/server/shared/Database/QueryResult.h +++ b/src/server/shared/Database/QueryResult.h @@ -165,7 +165,7 @@ class ResultBind return 64; case MYSQL_TYPE_GEOMETRY: - /* + /* Following types are not sent over the wire: MYSQL_TYPE_ENUM: MYSQL_TYPE_SET: @@ -212,10 +212,10 @@ class PreparedResultSet private: bool CheckFieldIndex(uint32 index) const - { + { if (!rbind->IsValidIndex(index)) return false; - + if (rbind->m_isNull[index]) return false; diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h index cd749b0c2d7..8d824c297d4 100644 --- a/src/server/shared/Database/Transaction.h +++ b/src/server/shared/Database/Transaction.h @@ -55,7 +55,7 @@ class Transaction void Append(PreparedStatement* statement); void Append(const char* sql); void PAppend(const char* sql, ...); - + size_t GetSize() { return m_queries.size(); } protected: |