Merge branch 'PHP-7.4'

author Derick Rethans <github@derickrethans.nl>

Fri, 21 Jun 2019 15:52:29 +0000 (16:52 +0100)

committer Derick Rethans <github@derickrethans.nl>

Fri, 21 Jun 2019 15:52:29 +0000 (16:52 +0100)
author Derick Rethans <github@derickrethans.nl>
Fri, 21 Jun 2019 15:52:29 +0000 (16:52 +0100)
committer Derick Rethans <github@derickrethans.nl>
Fri, 21 Jun 2019 15:52:29 +0000 (16:52 +0100)
diff --cc ext/mysqli/mysqli.c
Simple merge
diff --cc ext/mysqli/tests/mysqli_kill.phpt
Simple merge
diff --cc ext/mysqli/tests/mysqli_real_connect.phpt
Simple merge
author	Derick Rethans <github@derickrethans.nl>
	Fri, 21 Jun 2019 15:52:29 +0000 (16:52 +0100)
committer	Derick Rethans <github@derickrethans.nl>
	Fri, 21 Jun 2019 15:52:29 +0000 (16:52 +0100)
		1	2
ext/mysqli/mysqli.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/tests/mysqli_kill.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/tests/mysqli_real_connect.phpt	patch \|	diff1 \|	diff2 \|	blob \| history