com php-src: PDO MySQL: Make test libmysql compatible: ext/pdo_mysql/tests/bug_33689.phpt

Commit: b88a493aaa1bd6cecce3341ab25c6cc6a171c417 Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 18 Dec 2020 11:08:21 +0100 Parents: 9718e5987f16747dd9f0785a6bad1dcdd254bb5f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b88a493aaa1bd6cecce3341ab25c6cc6a171c417 Log: PDO MySQL: Make test libmysql compatible Changed paths: M ext/pdo_mysql/tests/bug_33689.phpt Diff: diff --git a/ext/pdo_mysql/tests/bug_33689.phpt b/ext/pdo_mysql/tests/bug_33689.phpt index 463a74ed588..08dc2235a0d 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']);