diff options
| author | Andrey Hristov <andrey@php.net> | 2019-06-19 16:43:06 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2019-06-19 16:43:06 +0300 |
| commit | 7ba1e6b34d9b79b2fadd0f6c041ea71d35bd5d23 (patch) | |
| tree | 93743ed21a40ece0874dd2c3d61983f8a78903e3 /ext/mysqli | |
| parent | a5db31946361af4655c9ed4622f2c87c062009f0 (diff) | |
| parent | 82021ad9df832a99976a48d35119c6284a7831cf (diff) | |
| download | php-git-7ba1e6b34d9b79b2fadd0f6c041ea71d35bd5d23.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
Diffstat (limited to 'ext/mysqli')
| -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 90967454c5..c4ed1bf543 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 : |