Merge branch 'PHP-7.2' into PHP-7.3

author Anatol Belski <ab@php.net>

Wed, 9 Jan 2019 15:16:47 +0000 (16:16 +0100)

committer Anatol Belski <ab@php.net>

Wed, 9 Jan 2019 15:16:47 +0000 (16:16 +0100)
author Anatol Belski <ab@php.net>
Wed, 9 Jan 2019 15:16:47 +0000 (16:16 +0100)
committer Anatol Belski <ab@php.net>
Wed, 9 Jan 2019 15:16:47 +0000 (16:16 +0100)
diff --cc ext/mysqlnd/mysqlnd.h
Simple merge
diff --cc ext/mysqlnd/mysqlnd_loaddata.c
Simple merge
author	Anatol Belski <ab@php.net>
	Wed, 9 Jan 2019 15:16:47 +0000 (16:16 +0100)
committer	Anatol Belski <ab@php.net>
	Wed, 9 Jan 2019 15:16:47 +0000 (16:16 +0100)
		1	2
ext/mysqlnd/mysqlnd.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_loaddata.c	patch \|	diff1 \|	diff2 \|	blob \| history