Merge branch 'PHP-7.3' into PHP-7.4

faizshukri · faizshukri · commit 65915d44cbee · 2019-06-19T16:43:15.000+03:00
diff --git 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 :

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ PHP_FUNCTION(mysqli_change_user)`
`637`	`637`	`RETURN_FALSE;`
`638`	`638`	`}`
`639`	`639`	`#if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET)`
`640`		`- if (mysql_get_server_version(mysql->mysql) < 501023L) {`
	`640`	`+ if (mysql_get_server_version(mysql->mysql) < 50123L) {`
`641`	`641`	`/*`
`642`	`642`	`Request the current charset, or it will be reset to the system one.`
`643`	`643`	`5.0 doesn't support it. Support added in 5.1.23 by fixing the following bug :`