diff options
author | Machiavelli <none@none> | 2010-09-29 14:59:05 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2010-09-29 14:59:05 +0200 |
commit | d3b30e979a4fd3f04263813ecbfe5eadef6fef6e (patch) | |
tree | c3f08c6c25f6284e35971cb94aac1334d6752e41 /src/server/shared/Database/MySQLConnection.cpp | |
parent | bf72fa749ff3beef2ba226862e2a5af7c170fc49 (diff) |
Fix linux compile. Thanks to click, hunshijie and tomkuzyno for spotting the culprits.
--HG--
branch : trunk
Diffstat (limited to 'src/server/shared/Database/MySQLConnection.cpp')
-rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp index 7c004927c4a..56be2b7dd38 100644 --- a/src/server/shared/Database/MySQLConnection.cpp +++ b/src/server/shared/Database/MySQLConnection.cpp @@ -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 |