Merge branch 'master' of git.php.net:/php-src

author Johannes Schlüter <johannes@php.net>

Tue, 5 Jun 2018 22:25:01 +0000 (00:25 +0200)

committer Johannes Schlüter <johannes@php.net>

Tue, 5 Jun 2018 22:25:01 +0000 (00:25 +0200)
author Johannes Schlüter <johannes@php.net>
Tue, 5 Jun 2018 22:25:01 +0000 (00:25 +0200)
committer Johannes Schlüter <johannes@php.net>
Tue, 5 Jun 2018 22:25:01 +0000 (00:25 +0200)
diff --cc ext/mysqlnd/mysqlnd_auth.c
Simple merge
diff --cc ext/mysqlnd/mysqlnd_connection.c
Simple merge
author	Johannes Schlüter <johannes@php.net>
	Tue, 5 Jun 2018 22:25:01 +0000 (00:25 +0200)
committer	Johannes Schlüter <johannes@php.net>
	Tue, 5 Jun 2018 22:25:01 +0000 (00:25 +0200)
		1	2
ext/mysqlnd/mysqlnd_auth.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd_connection.c	patch \|	diff1 \|	diff2 \|	blob \| history