Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Make MySQLPDOTest::extractVersion() more liberal

Author: cmb69

ext/pdo_mysql/tests/mysql_pdo_test.inc

@@ -107,7 +107,7 @@ class MySQLPDOTest extends PDOTest {
 
 		// stinky string which we need to parse
 		$parts = explode('.', $version_string);
-		if (count($parts) != 3)
+		if (count($parts) < 3)
 			return -1;
 
 		$version = (int)$parts[0] * 10000;

ext/pdo_mysql/tests/pdo_mysql_exec.phpt

@@ -75,7 +75,7 @@ MySQLPDOTest::skip();
 			exec_and_count(19, $db, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(255)) BEGIN SELECT VERSION() INTO ver_param; END;', 0);
 			// we got this far without problems. If there's an issue from now on, its a failure
 			$ignore_exception = false;
-			exec_and_count(20, $db, 'CALL p(@version)', 0);
+			exec_and_count(20, $db, 'CALL p(@version)', 1);
 			$stmt = $db->query('SELECT @version AS p_version');
 			$tmp = $stmt->fetchAll(PDO::FETCH_ASSOC);
 			if (count($tmp) > 1 || !isset($tmp[0]['p_version'])) {