diff options
| author | Andrey Hristov <andrey@php.net> | 2010-08-12 12:02:02 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-08-12 12:02:02 +0000 |
| commit | 92ef63a07b04bb85d6587b2905d068ce8a781061 (patch) | |
| tree | 4ce90d8821ccc1673b4d42539285049f93c46bc3 /ext/mysqlnd/mysqlnd.c | |
| parent | 8bf7114691540f29e6a07a34231fdf536652c1b8 (diff) | |
| download | php-git-92ef63a07b04bb85d6587b2905d068ce8a781061.tar.gz | |
Switch from using PHP_MAJOR_VERSION to separate define for
unicode. Unicode is no more, but these are "bookmarks" where
to change mysqlnd, if Unicode becomes trendy again.
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 a84b485910..faac95ea86 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -481,7 +481,7 @@ mysqlnd_connect_run_authentication( if (options->charset_name && (charset = mysqlnd_find_charset_name(options->charset_name))) { auth_packet->charset_no = charset->nr; } else { -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE auth_packet->charset_no = 200;/* utf8 - swedish collation, check mysqlnd_charset.c */ #else auth_packet->charset_no = greet_packet->charset_no; @@ -799,7 +799,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn, mysqlnd_local_infile_default(conn); -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE { unsigned int as_unicode = 1; conn->m->set_client_option(conn, MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE, (char *)&as_unicode TSRMLS_CC); @@ -2052,7 +2052,7 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn, case MYSQLND_OPT_NET_READ_BUFFER_SIZE: ret = conn->net->m.set_client_option(conn->net, option, value TSRMLS_CC); break; -#if PHP_MAJOR_VERSION >= 6 +#if MYSQLND_UNICODE case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE: conn->options.numeric_and_datetime_as_unicode = *(unsigned int*) value; break; |