diff options
| author | Andrey Hristov <andrey@php.net> | 2008-08-06 19:25:03 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-08-06 19:25:03 +0000 |
| commit | 2c841008f0cbf877699356320de71e0ad0a6eadd (patch) | |
| tree | bf2fb9ad1e097e8e55fea75997c740a59729e280 /ext/mysql/php_mysql_structs.h | |
| parent | f4e7f168e9f98582843f1dbd036b2d4cec07bb00 (diff) | |
| download | php-git-2c841008f0cbf877699356320de71e0ad0a6eadd.tar.gz | |
Re-add mysql_set_charset. Missed during introduction of mysqlnd. Exists in
HEAD, thus no merge
Diffstat (limited to 'ext/mysql/php_mysql_structs.h')
| -rw-r--r-- | ext/mysql/php_mysql_structs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index 6220e351d1..ee88bee195 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/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_stat); 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; |