From b88a493aaa1bd6cecce3341ab25c6cc6a171c417 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 18 Dec 2020 11:08:21 +0100 Subject: [PATCH] PDO MySQL: Make test libmysql compatible --- ext/pdo_mysql/tests/bug_33689.phpt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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']); -- 2.50.1