diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-08-30 19:52:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-08-30 22:57:19 +0200 |
| commit | ae3856b582c207007f2228f77522c204feb8183b (patch) | |
| tree | cf36026e572469d1691742ff026695b0ab69e837 | |
| parent | 521ec0b44459817964c8dedb3fac16e9b8c661f1 (diff) | |
Core/Database: Remove warning suppression for mysql_stmt_bind_param, it has been undeprecated by MySQL
(cherry picked from commit 55687670c8f5a282c0d4d9727e0bb1d088d50833)
| -rw-r--r-- | src/server/database/Database/MySQLConnection.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/server/database/Database/MySQLConnection.cpp b/src/server/database/Database/MySQLConnection.cpp index ff541281036..9460892256f 100644 --- a/src/server/database/Database/MySQLConnection.cpp +++ b/src/server/database/Database/MySQLConnection.cpp @@ -213,25 +213,6 @@ bool MySQLConnection::Execute(char const* sql) return true; } -static auto mysql_bind_param_no_deprecated(MYSQL_STMT* stmt, MYSQL_BIND* bnd) -{ -#if TRINITY_COMPILER == TRINITY_COMPILER_GNU -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#else -#pragma warning(push) -#pragma warning(disable: 4996) -#endif - - return mysql_stmt_bind_param(stmt, bnd); - -#if TRINITY_COMPILER == TRINITY_COMPILER_GNU -#pragma GCC diagnostic pop -#else -#pragma warning(pop) -#endif -} - bool MySQLConnection::Execute(PreparedStatementBase* stmt) { if (!m_Mysql) @@ -249,7 +230,7 @@ bool MySQLConnection::Execute(PreparedStatementBase* stmt) uint32 _s = getMSTime(); - if (mysql_bind_param_no_deprecated(msql_STMT, msql_BIND)) + if (mysql_stmt_bind_param(msql_STMT, msql_BIND)) { uint32 lErrno = mysql_errno(m_Mysql); TC_LOG_ERROR("sql.sql", "SQL(p): {}\n [ERROR]: [{}] {}", m_mStmt->getQueryString(), lErrno, mysql_stmt_error(msql_STMT)); @@ -297,7 +278,7 @@ bool MySQLConnection::_Query(PreparedStatementBase* stmt, MySQLPreparedStatement uint32 _s = getMSTime(); - if (mysql_bind_param_no_deprecated(msql_STMT, msql_BIND)) + if (mysql_stmt_bind_param(msql_STMT, msql_BIND)) { uint32 lErrno = mysql_errno(m_Mysql); TC_LOG_ERROR("sql.sql", "SQL(p): {}\n [ERROR]: [{}] {}", m_mStmt->getQueryString(), lErrno, mysql_stmt_error(msql_STMT)); |