From: Hannes Magnusson <bjori@php.net>
Date: Sun, 20 Jan 2008 14:13:11 +0000 (+0000)
Subject: MFH: Fixed bug #43875 (Two error messages returned for $new and $flag argument in... 
X-Git-Tag: php-5.2.6RC1~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66d39db51ee0489b3257c0e7299f1dfba7ac79a3;p=php

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

diff --git a/NEWS b/NEWS
index 69141e3c49..330ef1f883 100644
--- 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 c9c4f29eb2..d0249e99bb 100644
--- 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) {