archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- MFH: Removed UG(unicode) checks

Browse source
This commit is contained in:
Felipe Pena 2009-03-30 16:52:33 +00:00
parent 02fe66d1e0
commit dcd86aebd2
8 changed files with 94 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/mysqlnd/mysqlnd.c
View file

@ -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;