bjori           Sun Jan 20 14:13:12 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/mysql  php_mysql.c 
    /php-src    NEWS 
  Log:
  MFH: Fixed bug #43875 (Two error messages returned for $new and $flag 
argument in mysql_connect())
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.19&r2=1.213.2.6.2.20&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.19 
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.19        Mon Dec 31 07:20:08 2007
+++ php-src/ext/mysql/php_mysql.c       Sun Jan 20 14:13:11 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
  
-/* $Id: php_mysql.c,v 1.213.2.6.2.19 2007/12/31 07:20:08 sebastian Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.20 2008/01/20 14:13:11 bjori Exp $ */
 
 /* TODO:
  *
@@ -559,7 +559,7 @@
                if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, 
"|s!s!s!ll", &host_and_port, &host_len,
                                                                        &user, 
&user_len, &passwd, &passwd_len, 
                                                                        
&new_link, &client_flags)==FAILURE) {
-                       WRONG_PARAM_COUNT;
+                       return;
                }
 
                if (!host_and_port) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1057&r2=1.2027.2.547.2.1058&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1057 php-src/NEWS:1.2027.2.547.2.1058
--- php-src/NEWS:1.2027.2.547.2.1057    Fri Jan 18 07:10:21 2008
+++ php-src/NEWS        Sun Jan 20 14:13:11 2008
@@ -10,6 +10,8 @@
 
 - Fixed faulty fix for bug #40189 (endless loop in zlib.inflate stream 
filter). 
   (Greg)
+- Fixed bug #43875 (Two error messages returned for $new and $flag argument
+  in mysql_connect()). (Hannes)
 - Fixed bug #43863 (str_word_count() breaks on cyrillic "ya" in locale cp1251).
   (phprus at gmail dot com, Tony)
 - Fixed bug #43793 (zlib filter is unable to auto-detect gzip/zlib file 
headers).

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

Reply via email to