Merge branch 'PHP-5.6'

* PHP-5.6:
  sigh, can't even copypaste without screwing up
This commit is contained in:
Ferenc Kovacs 2015-04-02 00:07:20 +02:00
commit 956fa034e3

View file

@ -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');
}