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

sorry for committing it separated

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index cb226ed56bee90bc2da443411ff00be38d802311..9e6d7e4ffd96f3cd983da4008c442a75a4b04d7d 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -766,6 +766,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,