diff options
| author | Andrey Hristov <andrey@php.net> | 2019-06-19 16:43:15 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2019-06-19 16:43:15 +0300 |
| commit | 65915d44cbeef140b7b67225f48969cacc878d89 (patch) | |
| tree | 8361619ff6773351e1926bae0156e98c3373de0c /ext/mysqli/mysqli_api.c | |
| parent | 11f30d67ea058554cb6d16fb67c7708070f78d47 (diff) | |
| parent | 7ba1e6b34d9b79b2fadd0f6c041ea71d35bd5d23 (diff) | |
| download | php-git-65915d44cbeef140b7b67225f48969cacc878d89.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 12326df379..93071c2d0c 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -637,7 +637,7 @@ PHP_FUNCTION(mysqli_change_user) RETURN_FALSE; } #if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET) - if (mysql_get_server_version(mysql->mysql) < 501023L) { + if (mysql_get_server_version(mysql->mysql) < 50123L) { /* Request the current charset, or it will be reset to the system one. 5.0 doesn't support it. Support added in 5.1.23 by fixing the following bug : |