Merge branch 'PHP-7.4' into PHP-8.0

author Nikita Popov <nikita.ppv@gmail.com>

Wed, 28 Oct 2020 10:04:32 +0000 (11:04 +0100)

committer Nikita Popov <nikita.ppv@gmail.com>

Wed, 28 Oct 2020 10:04:32 +0000 (11:04 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Wed, 28 Oct 2020 10:04:32 +0000 (11:04 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Wed, 28 Oct 2020 10:04:32 +0000 (11:04 +0100)
diff --cc ext/mysqli/mysqli_api.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd_ps.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd_result.c
Simple merge
diff --cc ext/pdo_mysql/mysql_statement.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 28 Oct 2020 10:04:32 +0000 (11:04 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 28 Oct 2020 10:04:32 +0000 (11:04 +0100)
		1	2
ext/mysqli/mysqli_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_ps.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_result.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pdo_mysql/mysql_statement.c	patch \|	diff1 \|	diff2 \|	blob \| history