Rename mysql_character_set_name() to mysql_client_encoding(). pg_client_encoding...

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 1aeb002d26975107f8cbc4df9c9299ce01af293c..ee58c6e805d2597c131889569b27f0ea15432ab4 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -158,7 +158,7 @@ function_entry mysql_functions[] = {
        PHP_FE(mysql_real_escape_string,                                        NULL)
        PHP_FE(mysql_stat,                                                                      NULL)
        PHP_FE(mysql_thread_id,                                                         NULL)
-       PHP_FE(mysql_character_set_name,                                        NULL)
+       PHP_FE(mysql_client_encoding,                                   NULL)
        PHP_FE(mysql_ping,                                                                      NULL)
 #ifdef HAVE_GETINFO_FUNCS
        PHP_FE(mysql_get_client_info,                                           NULL)
@@ -1054,9 +1054,9 @@ PHP_FUNCTION(mysql_stat)
 }
 /* }}} */
 
-/* {{{ proto string mysql_character_set_name([int link_identifier])
+/* {{{ proto string mysql_client_encoding([int link_identifier])
        Returns the default character set for the current connection */
-PHP_FUNCTION(mysql_character_set_name)
+PHP_FUNCTION(mysql_client_encoding)
 {
        zval *mysql_link = NULL;
        int id = -1;

diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index d94697eae732bd30e824f578228b1cf5ac0204f3..053ece881cb61181236e3b812adc648c4f43b433 100644 (file)
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -89,7 +89,7 @@ PHP_FUNCTION(mysql_get_server_info);
 PHP_FUNCTION(mysql_info);
 PHP_FUNCTION(mysql_stat);
 PHP_FUNCTION(mysql_thread_id);
-PHP_FUNCTION(mysql_character_set_name);
+PHP_FUNCTION(mysql_client_encoding);
 PHP_FUNCTION(mysql_ping);
 
 ZEND_BEGIN_MODULE_GLOBALS(mysql)