diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-04-01 22:08:11 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-04-01 22:08:11 +0200 |
| commit | faab4301417517c2c83910101a37a9ed53eb57e1 (patch) | |
| tree | 5763ab91b046140e7c88704d71455f6068b5d915 /ext/pdo_mysql | |
| parent | 2d9399af3514189375f34610acc33a34de44d772 (diff) | |
| parent | 0a41af216ecabf76b54a78783b7cac01ca353ef9 (diff) | |
| download | php-git-faab4301417517c2c83910101a37a9ed53eb57e1.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
test fixes
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt index 5990ab812e..12699c5bf3 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt @@ -85,10 +85,10 @@ MySQLPDOTest::skip(); } catch (PDOException $e) { - printf("[001] %s, [%s] %s\n", + printf("[001] %s, [%s] %s [%s] %s\n", $e->getMessage(), - (is_object($db)) ? $db->errorCode() : 'n/a', - (is_object($db)) ? implode(' ', $db->errorInfo()) : 'n/a'); + (is_object($db1)) ? $db1->errorCode() : 'n/a', + (is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a'); } print "done!"; |