com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_dbl ib/tests/bug_45876.phpt

From: Date: Mon, 05 Sep 2016 07:19:26 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_dbl ib/tests/bug_45876.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-94299@lists.php.net to get a copy of this message
Commit: 54f6c8d6dfae3fa8e8353e7b9dc08dd5d7ee2c88 Author: Stanislav Malyshev <stas@php.net> Mon, 5 Sep 2016 00:19:26 -0700 Parents: 19350b6b7398edc9cc92e169aaf717585aa6ff11 84d495055db038508fdb288c49034748e257db7b Branches: PHP-7.0 PHP-7.1 master Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=54f6c8d6dfae3fa8e8353e7b9dc08dd5d7ee2c88 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Use integer placeholders, since values can vary with the TDS version Changed paths: MM ext/pdo_dblib/tests/bug_45876.phpt Diff: diff --cc ext/pdo_dblib/tests/bug_45876.phpt index 5f1026e,dd029f8..9de13ff --- a/ext/pdo_dblib/tests/bug_45876.phpt +++ b/ext/pdo_dblib/tests/bug_45876.phpt @@@ -15,9 -15,9 +15,9 @@@ var_dump($stmt->getColumnMeta(0)) $stmt = null; ?> --EXPECTF-- -array(8) { +array(10) { ["max_length"]=> - int(255) + int(%d) ["precision"]=> int(0) ["scale"]=> @@@ -35,5 -29,7 +35,5 @@@ ["name"]=> string(13) "TABLE_CATALOG" ["len"]=> - int(255) + int(%d) - ["pdo_type"]=> - int(2) }

« previous php.cvs (#94299) next »