tony2001 Thu Sep 22 16:14:34 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c
Log:
MFH: fix #32081 (mysqli_real_connect(): mysqli.default_socket in php.ini has
no effect) for real
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.118&r2=1.118.2.1&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118
php-src/ext/mysqli/mysqli_api.c:1.118.2.1
--- php-src/ext/mysqli/mysqli_api.c:1.118 Wed Aug 3 10:07:30 2005
+++ php-src/ext/mysqli/mysqli_api.c Thu Sep 22 16:14:34 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.118 2005/08/03 14:07:30 sniper Exp $
+ $Id: mysqli_api.c,v 1.118.2.1 2005/09/22 20:14:34 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1360,6 +1360,10 @@
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 CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
