andrey Wed Aug 6 19:25:04 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysql php_mysql.c php_mysql_structs.h Log: Re-add mysql_set_charset. Missed during introduction of mysqlnd. Exists in HEAD, thus no merge http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.25&r2=1.213.2.6.2.16.2.26&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.26 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25 Fri Jul 25 08:23:06 2008 +++ php-src/ext/mysql/php_mysql.c Wed Aug 6 19:25:03 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.25 2008/07/25 08:23:06 dmitry Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.26 2008/08/06 19:25:03 andrey Exp $ */ /* TODO: * @@ -192,7 +192,9 @@ #endif PHP_FE(mysql_info, NULL) - +#ifdef MYSQL_HAS_SET_CHARSET + PHP_FE(mysql_set_charset, NULL) +#endif /* for downwards compatability */ PHP_FALIAS(mysql, mysql_db_query, NULL) PHP_FALIAS(mysql_fieldname, mysql_field_name, NULL) @@ -1242,6 +1244,36 @@ /* }}} */ #endif +#ifdef MYSQL_HAS_SET_CHARSET +/* {{{ proto bool mysql_set_charset(string csname [, int link_identifier]) + sets client character set */ +PHP_FUNCTION(mysql_set_charset) +{ + zval *mysql_link = NULL; + char *csname; + int id = -1, csname_len; + php_mysql_conn *mysql; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|r", &csname, &csname_len, &mysql_link) == FAILURE) { + return; + } + + if (ZEND_NUM_ARGS() == 1) { + id = php_mysql_get_default_link(INTERNAL_FUNCTION_PARAM_PASSTHRU); + CHECK_LINK(id); + } + + ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink); + + if (!mysql_set_character_set(mysql->conn, csname)) { + RETURN_TRUE; + } else { + RETURN_FALSE; + } +} +/* }}} */ +#endif + #ifndef NETWARE /* The below two functions not supported on NetWare */ #if MYSQL_VERSION_ID < 40000 /* {{{ proto bool mysql_create_db(string database_name [, int link_identifier]) http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql_structs.h?r1=1.1.2.5&r2=1.1.2.6&diff_format=u Index: php-src/ext/mysql/php_mysql_structs.h diff -u php-src/ext/mysql/php_mysql_structs.h:1.1.2.5 php-src/ext/mysql/php_mysql_structs.h:1.1.2.6 --- php-src/ext/mysql/php_mysql_structs.h:1.1.2.5 Mon Jul 21 12:58:51 2008 +++ php-src/ext/mysql/php_mysql_structs.h Wed Aug 6 19:25:03 2008 @@ -18,7 +18,7 @@ */ -/* $Id: php_mysql_structs.h,v 1.1.2.5 2008/07/21 12:58:51 andrey Exp $ */ +/* $Id: php_mysql_structs.h,v 1.1.2.6 2008/08/06 19:25:03 andrey Exp $ */ #ifndef PHP_MYSQL_STRUCTS_H #define PHP_MYSQL_STRUCTS_H @@ -49,7 +49,7 @@ #define MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR #endif -#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || MYSQL_USE_MYSQLND +#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || defined(MYSQL_USE_MYSQLND) #define MYSQL_HAS_SET_CHARSET #endif @@ -106,6 +106,9 @@ PHP_FUNCTION(mysql_thread_id); PHP_FUNCTION(mysql_client_encoding); PHP_FUNCTION(mysql_ping); +#ifdef MYSQL_HAS_SET_CHARSET +PHP_FUNCTION(mysql_set_charset); +#endif ZEND_BEGIN_MODULE_GLOBALS(mysql) long default_link;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php