diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-04-02 00:07:20 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-04-02 00:07:20 +0200 |
| commit | 956fa034e3b9de643153fd83fd63d36547bfa821 (patch) | |
| tree | 4664b71be3b4ae90fb0f419faa32745759abc01e | |
| parent | 6923f081b7176a4cb07d2e678bad70b7140bde04 (diff) | |
| parent | 9806a37a79f9e858c8ea54899942c9a681b98f29 (diff) | |
| download | php-git-956fa034e3b9de643153fd83fd63d36547bfa821.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
sigh, can't even copypaste without screwing up
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt index 7972df313d..d59c930328 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt @@ -88,7 +88,7 @@ MySQLPDOTest::skip(); printf("[001] %s, [%s] %s [%s] %s\n", $e->getMessage(), (is_object($db1)) ? $db1->errorCode() : 'n/a', - (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a'); + (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a', (is_object($db2)) ? $db2->errorCode() : 'n/a', (is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a'); } |