Attached patch to rename the VERY annoying mysqli_character_set_name()
to something better: mysqli_get_charset()
--Jani
On Sat, 21 May 2005, Georg Richter wrote:
georg Sat May 21 04:46:47 2005 EDT
Added files:
/php-src/ext/mysqli/testsbug33090.phpt
Modified files:
/php-src/ext/mysqli php_mysqli.h
Log:
enabled set_charset for MySQL Versions = 5.0.6
added testcase for bug #33090
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.47r2=1.48ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.47
php-src/ext/mysqli/php_mysqli.h:1.48
--- php-src/ext/mysqli/php_mysqli.h:1.47Fri May 13 09:30:22 2005
+++ php-src/ext/mysqli/php_mysqli.h Sat May 21 04:46:45 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.47 2005/05/13 13:30:22 georg Exp $
+ $Id: php_mysqli.h,v 1.48 2005/05/21 08:46:45 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -103,7 +103,7 @@
#define PHP_MYSQLI_API
#endif
-#if MYSQL_VERSION_ID 40112 MYSQL_VERSION_ID 5
+#if (MYSQL_VERSION_ID 40112 MYSQL_VERSION_ID 5) || MYSQL_VERSION_ID
50005
#define HAVE_MYSQLI_SET_CHARSET
#endif
http://cvs.php.net/co.php/php-src/ext/mysqli/tests/bug33090.phpt?r=1.1p=1
Index: php-src/ext/mysqli/tests/bug33090.phpt
+++ php-src/ext/mysqli/tests/bug33090.phpt
--TEST--
Bug #33090
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
include (connect.inc);
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd);
mysqli_select_db($link, test);
if (!($link-prepare(this makes no sense))) {
printf(%d\n, $link-errno);
printf(%s\n, $link-sqlstate);
}
$link-close();
?
--EXPECT--
1064
42000
--
Donate @ http://pecl.php.net/wishlist.php/sniper
Index: mysqli_api.c
===
RCS file: /repository/php-src/ext/mysqli/mysqli_api.c,v
retrieving revision 1.116
diff -u -r1.116 mysqli_api.c
--- mysqli_api.c21 May 2005 08:38:53 - 1.116
+++ mysqli_api.c23 May 2005 06:57:36 -
@@ -399,9 +399,9 @@
}
/* }}} */
-/* {{{ proto string mysqli_character_set_name(object link)
+/* {{{ proto string mysqli_get_charset(object link)
Returns the name of the character set used for this connection */
-PHP_FUNCTION(mysqli_character_set_name)
+PHP_FUNCTION(mysqli_get_charset)
{
MY_MYSQL*mysql;
zval*mysql_link;
Index: mysqli_fe.c
===
RCS file: /repository/php-src/ext/mysqli/mysqli_fe.c,v
retrieving revision 1.44
diff -u -r1.44 mysqli_fe.c
--- mysqli_fe.c 13 May 2005 13:11:40 - 1.44
+++ mysqli_fe.c 23 May 2005 06:57:36 -
@@ -54,7 +54,6 @@
PHP_FE(mysqli_affected_rows,
NULL)
PHP_FE(mysqli_autocommit,
NULL)
PHP_FE(mysqli_change_user,
NULL)
- PHP_FE(mysqli_character_set_name,
NULL)
PHP_FE(mysqli_close,
NULL)
PHP_FE(mysqli_commit,
NULL)
PHP_FE(mysqli_connect,
NULL)
@@ -116,6 +115,7 @@
PHP_FE(mysqli_rpl_probe,
NULL)
PHP_FE(mysqli_rpl_query_type,
NULL)
PHP_FE(mysqli_select_db,
NULL)
+ PHP_FE(mysqli_get_charset,
NULL)
#ifdef HAVE_MYSQLI_SET_CHARSET
PHP_FE(mysqli_set_charset,
NULL)
#endif
@@ -158,7 +158,9 @@
PHP_FALIAS(mysqli_bind_result,
mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
PHP_FALIAS(mysqli_client_encoding,
- mysqli_character_set_name,
NULL)
+ mysqli_get_charset,
NULL)
+ PHP_FALIAS(mysqli_character_set_name,
+ mysqli_get_charset,
NULL)
PHP_FALIAS(mysqli_escape_string,
mysqli_real_escape_string,
NULL)
PHP_FALIAS(mysqli_fetch, mysqli_stmt_fetch, NULL)
@@ -181,7 +183,7 @@
function_entry
