diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-30 16:52:33 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-30 16:52:33 +0000 |
| commit | dcd86aebd24acbcd24b0740238a1e93ab9ef9d4b (patch) | |
| tree | bd736429240453a6fd9269756a3776c507d3a1c7 /ext/mysqlnd/mysqlnd.c | |
| parent | 02fe66d1e04a0ef6abcd30033f95aac3c132c6be (diff) | |
| download | php-git-dcd86aebd24acbcd24b0740238a1e93ab9ef9d4b.tar.gz | |
- MFH: Removed UG(unicode) checks
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 0231cbf14e..b46b273f89 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; + } else { #if PHP_MAJOR_VERSION >= 6 - } else if (UG(unicode)) { auth_packet->charset_no = 200;/* utf8 - swedish collation, check mysqlnd_charset.c */ -#endif - } else { +#else auth_packet->charset_no = greet_packet.charset_no; +#endif } auth_packet->db = db; auth_packet->db_len = db_len; |