From d3b30e979a4fd3f04263813ecbfe5eadef6fef6e Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Wed, 29 Sep 2010 14:59:05 +0200
Subject: Fix linux compile. Thanks to click, hunshijie and tomkuzyno for
 spotting the culprits.

--HG--
branch : trunk
---
 src/server/shared/Database/MySQLConnection.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server/shared/Database/MySQLConnection.cpp')

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
-- 
cgit v1.2.3