From: Andrey Hristov Date: Mon, 27 Sep 2010 12:37:23 +0000 (+0000) Subject: Fixed bug #45921 (Can't initialize character set hebrew) X-Git-Tag: php-5.4.0alpha1~191^2~884 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a43b14849afe144b648405f6b161f2747e38739;p=php 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 cb226ed56b..9e6d7e4ffd 100644 --- 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 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,