From 99ebeb164523bc62b8ef221927a44a1d54fae71d Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 14 Dec 2007 05:09:29 +0000 Subject: [PATCH] added amb1276 - local socket support --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401796 --- extensions/mysql/mysql/MyDriver.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/extensions/mysql/mysql/MyDriver.cpp b/extensions/mysql/mysql/MyDriver.cpp index 49ecd91c..a39e12ec 100644 --- a/extensions/mysql/mysql/MyDriver.cpp +++ b/extensions/mysql/mysql/MyDriver.cpp @@ -94,6 +94,7 @@ const char *MyDriver::GetProductName() MYSQL *Connect(const DatabaseInfo *info, char *error, size_t maxlength) { MYSQL *mysql = mysql_init(NULL); + const char *host = NULL, *socket = NULL; if (info->maxTimeout > 0) { @@ -106,13 +107,24 @@ MYSQL *Connect(const DatabaseInfo *info, char *error, size_t maxlength) my_bool my_true = true; mysql_options(mysql, MYSQL_OPT_RECONNECT, (const char *)&my_true); + if (info->host[0] == '/') + { + host = "localhost"; + socket = info->host; + } + else + { + host = info->host; + socket = NULL; + } + if (!mysql_real_connect(mysql, - info->host, + host, info->user, info->pass, info->database, info->port, - NULL, + socket, M_CLIENT_MULTI_RESULTS)) { /* :TODO: expose UTIL_Format from smutil! */