diff options
| author | Xinchen Hui <laruence@php.net> | 2014-08-15 16:58:22 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-08-15 16:58:22 +0800 |
| commit | d1b48a8b02d2fcee393aab7921d16054d323729b (patch) | |
| tree | bd1b2a0174e390a76037e7787a88dad1b900b877 /ext/mysqli/mysqli_api.c | |
| parent | 101c055396c3ef07bd6b0aa0bb0b889c7ab7d437 (diff) | |
| parent | b01b971ec0eb5628d82b80b27365db383b375dba (diff) | |
| download | php-git-d1b48a8b02d2fcee393aab7921d16054d323729b.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Conflicts:
ext/mysqli/mysqli_api.c
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index e169b90233..b5a68c2b93 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1688,6 +1688,10 @@ static int mysqli_options_get_option_zval_type(int option) { switch (option) { #ifdef MYSQLI_USE_MYSQLND +#if PHP_MAJOR_VERSION >= 6 + /* PHP-7 doesn't supprt unicode yet ??? */ + /*case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:*/ +#endif case MYSQLND_OPT_NET_CMD_BUFFER_SIZE: case MYSQLND_OPT_NET_READ_BUFFER_SIZE: #ifdef MYSQLND_STRING_TO_INT_CONVERSION |