summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-12-18 11:08:21 +0100
committerNikita Popov <nikita.ppv@gmail.com>2020-12-18 11:28:15 +0100
commitb88a493aaa1bd6cecce3341ab25c6cc6a171c417 (patch)
tree3a4feacfe521a19fe2e2143325c8322e8b4a024d
parent9718e5987f16747dd9f0785a6bad1dcdd254bb5f (diff)
downloadphp-git-b88a493aaa1bd6cecce3341ab25c6cc6a171c417.tar.gz
PDO MySQL: Make test libmysql compatible
-rw-r--r--ext/pdo_mysql/tests/bug_33689.phpt3
1 files changed, 2 insertions, 1 deletions
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']);