diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-04-01 23:06:32 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-04-01 23:06:32 +0200 |
| commit | 6923f081b7176a4cb07d2e678bad70b7140bde04 (patch) | |
| tree | 8817ffda557448bb3751e9622ae8e1e71414aed2 | |
| parent | 0328a60eeccd2cb0b98ea3c0edbf1214f1668b47 (diff) | |
| parent | e70e2d8310b58a59dc14fa3336624cb022a5daaa (diff) | |
| download | php-git-6923f081b7176a4cb07d2e678bad70b7140bde04.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
oop, put both the error number and message for both db object to the error message
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt index 12699c5bf3..7972df313d 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt @@ -88,6 +88,8 @@ 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($db2)) ? $db2->errorCode() : 'n/a', (is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a'); } |