iliaa           Thu Feb 24 18:59:51 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/mysqli mysqli_nonapi.c 
    /php-src    NEWS 
  Log:
  MFH: Fixed bug #32081 (default socket value is not being used).
  
  
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.34.2.4&r2=1.34.2.5&ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.4 
php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.5
--- php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.4 Mon Nov  1 04:52:04 2004
+++ php-src/ext/mysqli/mysqli_nonapi.c  Thu Feb 24 18:59:49 2005
@@ -15,7 +15,7 @@
   | Author: Georg Richter <[EMAIL PROTECTED]>                                |
   +----------------------------------------------------------------------+
 
-  $Id: mysqli_nonapi.c,v 1.34.2.4 2004/11/01 09:52:04 georg Exp $ 
+  $Id: mysqli_nonapi.c,v 1.34.2.5 2005/02/24 23:59:49 iliaa Exp $ 
 */
 
 #ifdef HAVE_CONFIG_H
@@ -74,6 +74,10 @@
                RETURN_FALSE;
        }
 
+       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 */
 
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.261&r2=1.1760.2.262&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.261 php-src/NEWS:1.1760.2.262
--- php-src/NEWS:1.1760.2.261   Wed Feb 23 07:33:47 2005
+++ php-src/NEWS        Thu Feb 24 18:59:50 2005
@@ -25,6 +25,7 @@
   is passed. (Tony)
 - Fixed posix_getsid() & posix_getpgid() to return sid & pgid instead 
   of true. (Tony)
+- Fixed bug #32081 (in mysqli default socket value is not being used). (Ilia)
 - Fixed bug #32021 (Crash caused by range('', 'z')). (Derick)
 - Fixed bug #32011 (Fragments which replaced Nodes are not globaly useable).
   (Rob)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to