summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2010-09-27 12:35:59 +0000
committerAndrey Hristov <andrey@php.net>2010-09-27 12:35:59 +0000
commit42a80fac8c2b98ecddce4da3e4cc779dda07e693 (patch)
treea01a368721fb598f14720acfa9a409a0b77e5486 /ext
parentb080cfcc71580614f521706d119d17495855073d (diff)
downloadphp-git-42a80fac8c2b98ecddce4da3e4cc779dda07e693.tar.gz
Fixed bug #45921 (Can't initialize character set hebrew)
Diffstat (limited to 'ext')
-rw-r--r--ext/mysqli/mysqli.c1
-rw-r--r--ext/mysqli/tests/mysqli_constants.phpt1
2 files changed, 2 insertions, 0 deletions
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,