From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 18 Dec 2020 10:08:21 +0000 (+0100)
Subject: PDO MySQL: Make test libmysql compatible
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b88a493aaa1bd6cecce3341ab25c6cc6a171c417;p=php

PDO MySQL: Make test libmysql compatible
---

diff --git a/ext/pdo_mysql/tests/bug_33689.phpt b/ext/pdo_mysql/tests/bug_33689.phpt
index 463a74ed58..08dc2235a0 100644
--- a/ext/pdo_mysql/tests/bug_33689.phpt
+++ b/ext/pdo_mysql/tests/bug_33689.phpt
@@ -27,7 +27,8 @@ $stmt->execute();
 $tmp = $stmt->getColumnMeta(0);
 
 // libmysql and mysqlnd will show the pdo_type entry at a different position in the hash
-if (!isset($tmp['pdo_type']) || (isset($tmp['pdo_type']) && $tmp['pdo_type'] != 1))
+// and will report a different type, as mysqlnd returns native types.
+if (!isset($tmp['pdo_type']) || ($tmp['pdo_type'] != 1 && $tmp['pdo_type'] != 2))
     printf("Expecting pdo_type = 1 got %s\n", $tmp['pdo_type']);
 else
     unset($tmp['pdo_type']);