Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix linux compile. Thanks to click, hunshijie and tomkuzyno for spotting the culprits.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-09-29 14:59:05 +02:00
parent bf72fa749f
commit d3b30e979a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/shared/Database/MySQLConnection.cpp
View File

@@ -75,7 +75,7 @@ bool MySQLConnection::Open(const MySQLConnectionInfo& connInfo)
}
int port;
char* unix_socket;
char const* unix_socket;
mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
#ifdef _WIN32
@@ -96,13 +96,13 @@ bool MySQLConnection::Open(const MySQLConnectionInfo& connInfo)
{
unsigned int opt = MYSQL_PROTOCOL_SOCKET;
mysql_options(mysqlInit, MYSQL_OPT_PROTOCOL, (char const*)&opt);
connInfo.host = "localhost";
connInfo.ChangeHost("localhost");
port = 0;
unix_socket = connInfo.port_or_socket.c_str();
}
else // generic case
{
port = atoi(port_or_socket.c_str());
port = atoi(connInfo.port_or_socket.c_str());
unix_socket = 0;
}
#endif

5
src/server/shared/Database/MySQLConnection.h
View File

@@ -53,6 +53,11 @@ struct MySQLConnectionInfo
std::string database;
std::string host;
std::string port_or_socket;
void ChangeHost(const std::string& newHost) /// Needed for unix socket case
{
host = newHost;
}
};
class MySQLConnection