MFH: Fixed bug #43875 (Two error messages returned for $new and $flag argument in...

diff --git a/NEWS b/NEWS
index 69141e3c4900035b0defc3a9155a9e2a8f320e62..330ef1f883cd8588adcaf395ecbaa2bfeb7ebc19 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,8 @@ PHP                                                                        NEWS
 
 - 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).

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index c9c4f29eb2f84d610b3d5de2dff0233be39900a9..d0249e99bb68b6d08b2d7744090386d4abe8a911 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -559,7 +559,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                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) {