summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott MacVicar <scottmac@php.net>2007-05-14 18:09:20 +0000
committerScott MacVicar <scottmac@php.net>2007-05-14 18:09:20 +0000
commit607467451d8b7e1b011a8dc358ff0ad704b1d43d (patch)
tree022266cdbd16b36c7b71dce2e1110b3f4c1e82d1
parentac38b635cb83304566b31901cf4aa95bd108d941 (diff)
downloadphp-git-607467451d8b7e1b011a8dc358ff0ad704b1d43d.tar.gz
Prefix NEWS item so documentation team know of new function and typo from old parsing API spotted by bjori
-rw-r--r--NEWS2
-rw-r--r--ext/mysql/php_mysql.c2
2 files changed, 2 insertions, 2 deletions
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) {