Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix mysqli_get_warnings() with multi queries

Author: nikic

ext/mysqli/mysqli_nonapi.c

@@ -979,7 +979,7 @@ PHP_FUNCTION(mysqli_get_warnings)
 	MY_MYSQL			*mysql;
 	zval				*mysql_link;
 	MYSQLI_RESOURCE		*mysqli_resource;
-	MYSQLI_WARNING		*w;
+	MYSQLI_WARNING		*w = NULL;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
 		RETURN_THROWS();
@@ -992,7 +992,8 @@ PHP_FUNCTION(mysqli_get_warnings)
 #else
 		w = php_get_warnings(mysql->mysql);
 #endif
-	} else {
+	}
+	if (!w) {
 		RETURN_FALSE;
 	}
 	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
@@ -1008,7 +1009,7 @@ PHP_FUNCTION(mysqli_stmt_get_warnings)
 	MY_STMT				*stmt;
 	zval				*stmt_link;
 	MYSQLI_RESOURCE		*mysqli_resource;
-	MYSQLI_WARNING		*w;
+	MYSQLI_WARNING		*w = NULL;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &stmt_link, mysqli_stmt_class_entry) == FAILURE) {
 		RETURN_THROWS();
@@ -1017,7 +1018,8 @@ PHP_FUNCTION(mysqli_stmt_get_warnings)
 
 	if (mysqli_stmt_warning_count(stmt->stmt)) {
 		w = php_get_warnings(mysqli_stmt_get_connection(stmt->stmt));
-	} else {
+	}
+	if (!w) {
 		RETURN_FALSE;
 	}
 	mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));

ext/mysqli/tests/bug54221.phpt

@@ -42,6 +42,5 @@ mysqli.reconnect = Off
 	print "done!";
 ?>
 --EXPECT--
-Warning: : 
 Warning: 1050: Table 't54221' already exists
 done!