diff options
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 1ed6278e2c..329dc88500 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -329,7 +329,7 @@ PHP_FUNCTION(mysqli_get_charset) { MY_MYSQL *mysql; zval *mysql_link; - CHARSET_INFO *cs; + MY_CHARSET_INFO cs; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; @@ -338,13 +338,16 @@ PHP_FUNCTION(mysqli_get_charset) object_init(return_value); - cs = (CHARSET_INFO *)mysql->mysql->charset; + mysql_get_character_set_info(mysql->mysql, &cs); - add_property_string(return_value, "charset", (cs->name) ? (char *)cs->csname : "", 1); - add_property_string(return_value, "collation",(cs->name) ? (char *)cs->name : "", 1); - add_property_string(return_value, "comment", (cs->comment) ? (char *)cs->comment : "", 1); - add_property_long(return_value, "min_length", cs->mbminlen); - add_property_long(return_value, "max_length", cs->mbmaxlen); + add_property_string(return_value, "charset", (cs.name) ? (char *)cs.csname : "", 1); + add_property_string(return_value, "collation",(cs.name) ? (char *)cs.name : "", 1); + add_property_string(return_value, "comment", (cs.comment) ? (char *)cs.comment : "", 1); + add_property_string(return_value, "dir", (cs.dir) ? (char *)cs.dir : "", 1); + add_property_long(return_value, "min_length", cs.mbminlen); + add_property_long(return_value, "max_length", cs.mbmaxlen); + add_property_long(return_value, "number", cs.number); + add_property_long(return_value, "state", cs.state); } /* }}} */ |