Prefix NEWS item so documentation team know of new function and typo from old parsing...

diff --git a/NEWS b/NEWS
index 018b4fcbeb37faf345a0a1f15710a2857c7a6420..756be6e0b7fbb92ae85a09bc451ede6b38ebce90 100644 (file)
--- 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 bc090144e1bd57ae466ca20bb087bd908e14b9f6..029697c51c9a203736f8db9d62b9fcd6ba651b87 100644 (file)
--- 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) {