From: Scott MacVicar <scottmac@php.net>
Date: Mon, 14 May 2007 18:09:20 +0000 (+0000)
Subject: Prefix NEWS item so documentation team know of new function and typo from old parsing... 
X-Git-Tag: php-5.2.3RC1~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=607467451d8b7e1b011a8dc358ff0ad704b1d43d;p=php

Prefix NEWS item so documentation team know of new function and typo from old parsing API spotted by bjori
---

diff --git a/NEWS b/NEWS
index 018b4fcbeb..756be6e0b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2007, PHP 5.2.3
-- Added function mysql_set_charset(). Allows connection encoding to be altered
+- [DOC] Added function mysql_set_charset(). Allows connection encoding to be altered
   at run time. (Scott)
 - Allow SOAP extension's handler() to work even when
   always_populate_raw_post_data is off. (Ilia)
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index bc090144e1..029697c51c 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1141,7 +1141,7 @@ PHP_FUNCTION(mysql_set_charset)
 	php_mysql_conn *mysql;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &csname, &csname_len, &mysql_link) == FAILURE) {
-		WRONG_PARAM_COUNT;
+		return;
 	}
 
 	if (ZEND_NUM_ARGS() == 1) {