diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-04-14 10:42:41 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-04-14 10:42:41 +0000 |
| commit | 3dd8663cb75a1ab013067c101bf2779c8eda9563 (patch) | |
| tree | e4cc86e947fcece5d8198965d124bb95f25067b7 | |
| parent | f3c528516bf5b24cbf0048eb31b04edaa6d5cd74 (diff) | |
| download | php-git-3dd8663cb75a1ab013067c101bf2779c8eda9563.tar.gz | |
use default socket (removed by mistake?)
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 4 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 77af19f856..848a0184f9 100644 --- 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 437c2f286b..9e3b57a360 100644 --- 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 */ |