diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/mysqli/mysqli.c | 1 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_constants.phpt | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -99,6 +99,7 @@ - Fixed bug #49215 (make fails on glob_wrapper). (Felipe) - Fixed bug #48831 (php -i has different output to php --ini). (Richard, Pierre) +- Fixed bug #45921 (Can't initialize character set hebrew). (Andrey) 22 Jul 2010, PHP 5.3.3 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia) diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index f1c16a722f..0325e89ce5 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -764,6 +764,7 @@ PHP_MINIT_FUNCTION(mysqli) #endif REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_NAME", MYSQL_SET_CHARSET_NAME, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("MYSQLI_SET_CHARSET_DIR", MYSQL_SET_CHARSET_DIR, CONST_CS | CONST_PERSISTENT); /* bind support */ REGISTER_LONG_CONSTANT("MYSQLI_NO_DATA", MYSQL_NO_DATA, CONST_CS | CONST_PERSISTENT); diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt index 851d5b9693..30503f5f46 100644 --- a/ext/mysqli/tests/mysqli_constants.phpt +++ b/ext/mysqli/tests/mysqli_constants.phpt @@ -84,6 +84,7 @@ require_once('skipifconnectfailure.inc'); "MYSQLI_REPORT_ERROR" => true, "MYSQLI_REPORT_OFF" => true, "MYSQLI_SET_CHARSET_NAME" => true, + "MYSQLI_SET_CHARSET_DIR" => true, "MYSQLI_REFRESH_GRANT" => true, "MYSQLI_REFRESH_LOG" => true, "MYSQLI_REFRESH_TABLES" => true, |