Fixed bug #45921 (Can't initialize character set hebrew)

diff --git a/NEWS b/NEWS
index 3f7cb5eab95fad88b9127932ceaeda6745d6c136..d69a709bfe79a1c2f63124e1c25a64f4baadf94a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 f1c16a722fe827a4fa327c8d47d9ccf7755d31ca..0325e89ce52b39beefdf7d4cef9b15104b597a01 100644 (file)
--- 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 851d5b969371e0f693554b087ede6b9b374074a0..30503f5f46b2aa8e36d60dee16dc60d4ce5caf45 100644 (file)
--- 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,