diff options
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.cpp | 6 | ||||
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.h | 5 |
2 files changed, 8 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 diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h index 0c18ad8b7fb..cfef240fda2 100644 --- a/src/server/shared/Database/MySQLConnection.h +++ b/src/server/shared/Database/MySQLConnection.h @@ -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 |