use default socket (removed by mistake?)

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 77af19f856aa7cbfc0a04c482c2071b6626323ae..848a0184f936a565cb15b0fe1b99c87560146bab 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1458,6 +1458,10 @@ PHP_FUNCTION(mysqli_real_connect)
                flags ^= CLIENT_LOCAL_FILES;
        }
 
+       if (!socket) {
+               socket = MyG(default_socket);
+       }
+
        if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname ,port, socket ,flags) == NULL) {
                php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql) TSRMLS_CC);
                php_mysqli_throw_sql_exception( mysql->mysql->net.sqlstate, mysql->mysql->net.last_errno TSRMLS_CC,

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 437c2f286babbe705a3b06fe4d6be692dbfc4e05..9e3b57a360d46659416429ce3e97fba67351a8e9 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -90,6 +90,10 @@ PHP_FUNCTION(mysqli_connect)
        mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (const char *)&my_true);
 #endif
 
+       if (!socket) {
+               socket = MyG(default_socket);
+       }
+
        if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL) {
                /* Save error messages */