diff options
| author | Hannes Magnusson <bjori@php.net> | 2008-01-20 14:13:11 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2008-01-20 14:13:11 +0000 |
| commit | 66d39db51ee0489b3257c0e7299f1dfba7ac79a3 (patch) | |
| tree | eec655dca66c0ccfd1f953d581eaafe52b6d8b44 | |
| parent | a4c915c855101caafbf7eff9b438fa9619eb5d33 (diff) | |
| download | php-git-66d39db51ee0489b3257c0e7299f1dfba7ac79a3.tar.gz | |
MFH: Fixed bug #43875 (Two error messages returned for $new and $flag argument in mysql_connect())
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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) { |