diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-27 19:28:26 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-27 19:28:26 +0000 |
| commit | 04c90a0f510b0524ea1b4151841d41208520a48e (patch) | |
| tree | ebf20eab8aedcca2b0ba59126d7b2ec27187d055 /ext/mysqlnd/mysqlnd.c | |
| parent | fe23a6b147175ec35a40053ac362e37c6f6148f0 (diff) | |
| download | php-git-04c90a0f510b0524ea1b4151841d41208520a48e.tar.gz | |
- Removed:
- UG(unicode) checks
- Changed:
- ZEND_STR_TYPE -> IS_UNICODE
- convert_to_text -> convert_to_unicode
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 4dbc670660..0f7c30bfb2 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -663,12 +663,12 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn, (charset = mysqlnd_find_charset_name(conn->options.charset_name))) { auth_packet->charset_no = charset->nr; -#if PHP_MAJOR_VERSION >= 6 - } else if (UG(unicode)) { - auth_packet->charset_no = 200;/* utf8 - swedish collation, check mysqlnd_charset.c */ -#endif } else { +#if PHP_MAJOR_VERSION >= 6 + auth_packet->charset_no = 200;/* utf8 - swedish collation, check mysqlnd_charset.c */ +#else auth_packet->charset_no = greet_packet.charset_no; +#endif } auth_packet->db = db; auth_packet->db_len = db_len; |