mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-24 19:37:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mac build (#84)

Browse source 
Change my_bool to bool https://bugs.mysql.com/bug.php?id=85131
This commit is contained in:
Rochet2 2018-08-19 19:11:35 +03:00 • committed by Antz
parent 99da7db2db
commit 86a4c97d21
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/shared/Database/DatabaseMysql.cpp
View file

@ -434,7 +434,7 @@ void MySqlPreparedStatement::addParam(unsigned int nIndex, const SqlStmtFieldDat
MYSQL_BIND& pData = m_pInputArgs[nIndex];
my_bool bUnsigned = 0;
bool bUnsigned = false;
enum_field_types dataType = ToMySQLType(data, bUnsigned);
// setup MYSQL_BIND structure
@ -479,24 +479,24 @@ bool MySqlPreparedStatement::execute()
return true;
}
enum_field_types MySqlPreparedStatement::ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned)
enum_field_types MySqlPreparedStatement::ToMySQLType(const SqlStmtFieldData& data, bool& bUnsigned)
{
bUnsigned = 0;
bUnsigned = false;
enum_field_types dataType = MYSQL_TYPE_NULL;
switch (data.type())
{
case FIELD_NONE: dataType = MYSQL_TYPE_NULL; break;
// MySQL does not support MYSQL_TYPE_BIT as input type
case FIELD_BOOL: // dataType = MYSQL_TYPE_BIT; bUnsigned = 1; break;
case FIELD_UI8: dataType = MYSQL_TYPE_TINY; bUnsigned = 1; break;
case FIELD_BOOL: // dataType = MYSQL_TYPE_BIT; bUnsigned = true; break;
case FIELD_UI8: dataType = MYSQL_TYPE_TINY; bUnsigned = true; break;
case FIELD_I8: dataType = MYSQL_TYPE_TINY; break;
case FIELD_I16: dataType = MYSQL_TYPE_SHORT; break;
case FIELD_UI16: dataType = MYSQL_TYPE_SHORT; bUnsigned = 1; break;
case FIELD_UI16: dataType = MYSQL_TYPE_SHORT; bUnsigned = true; break;
case FIELD_I32: dataType = MYSQL_TYPE_LONG; break;
case FIELD_UI32: dataType = MYSQL_TYPE_LONG; bUnsigned = 1; break;
case FIELD_UI32: dataType = MYSQL_TYPE_LONG; bUnsigned = true; break;
case FIELD_I64: dataType = MYSQL_TYPE_LONGLONG; break;
case FIELD_UI64: dataType = MYSQL_TYPE_LONGLONG; bUnsigned = 1; break;
case FIELD_UI64: dataType = MYSQL_TYPE_LONGLONG; bUnsigned = true; break;
case FIELD_FLOAT: dataType = MYSQL_TYPE_FLOAT; break;
case FIELD_DOUBLE: dataType = MYSQL_TYPE_DOUBLE; break;
case FIELD_STRING: dataType = MYSQL_TYPE_STRING; break;

2
src/shared/Database/DatabaseMysql.h
View file

@ -96,7 +96,7 @@ class MySqlPreparedStatement : public SqlPreparedStatement
* @param bUnsigned
* @return enum_field_types
*/
static enum_field_types ToMySQLType(const SqlStmtFieldData& data, my_bool& bUnsigned);
static enum_field_types ToMySQLType(const SqlStmtFieldData& data, bool& bUnsigned);
private:
/**