diff options
| author | Spp <spp@jorge.gr> | 2013-01-03 09:17:53 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-01-03 09:17:53 +0100 |
| commit | d35d33aa86443f6bdde75a5923fcde8f3eb979e9 (patch) | |
| tree | a4b16a6d5f99d6a3cbec6714f8154f12858ff48d /src/server/shared | |
| parent | 6b668c8337d2efe306ad4c5a1d0ade6e34b5d66d (diff) | |
| parent | 27b1e457e6b002ad52fd44b78f51358ae058323a (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Entities/Object/ObjectDefines.h
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/Kalimdor/CMakeLists.txt
Diffstat (limited to 'src/server/shared')
| -rw-r--r-- | src/server/shared/Database/PreparedStatement.cpp | 6 | ||||
| -rw-r--r-- | src/server/shared/Database/PreparedStatement.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index 38c67495a65..86010e61686 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -241,7 +241,7 @@ void MySQLPreparedStatement::ClearParameters() } } -static bool ParementerIndexAssertFail(uint32 stmtIndex, uint8 index, uint32 paramCount) +static bool ParamenterIndexAssertFail(uint32 stmtIndex, uint8 index, uint32 paramCount) { sLog->outError(LOG_FILTER_SQL_DRIVER, "Attempted to bind parameter %u%s on a PreparedStatement %u (statement has only %u parameters)", uint32(index) + 1, (index == 1 ? "st" : (index == 2 ? "nd" : (index == 3 ? "rd" : "nd"))), stmtIndex, paramCount); return false; @@ -250,7 +250,7 @@ static bool ParementerIndexAssertFail(uint32 stmtIndex, uint8 index, uint32 para //- Bind on mysql level bool MySQLPreparedStatement::CheckValidIndex(uint8 index) { - ASSERT(index < m_paramCount || ParementerIndexAssertFail(m_stmt->m_index, index, m_paramCount)); + ASSERT(index < m_paramCount || ParamenterIndexAssertFail(m_stmt->m_index, index, m_paramCount)); if (m_paramsSet[index]) sLog->outWarn(LOG_FILTER_SQL, "[WARNING] Prepared Statement (id: %u) trying to bind value on already bound index (%u).", m_stmt->m_index, index); @@ -386,7 +386,7 @@ void MySQLPreparedStatement::setValue(MYSQL_BIND* param, enum_field_types type, memcpy(param->buffer, value, len); } -std::string MySQLPreparedStatement::getQueryString(std::string const &sqlPattern) const +std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern) const { std::string queryString = sqlPattern; diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h index 9334bc6dc66..2cab6e40de0 100644 --- a/src/server/shared/Database/PreparedStatement.h +++ b/src/server/shared/Database/PreparedStatement.h @@ -135,7 +135,7 @@ class MySQLPreparedStatement PreparedStatement* m_stmt; void ClearParameters(); bool CheckValidIndex(uint8 index); - std::string getQueryString(std::string const &sqlPattern) const; + std::string getQueryString(std::string const& sqlPattern) const; private: void setValue(MYSQL_BIND* param, enum_field_types type, const void* value, uint32 len, bool isUnsigned); |