Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: oop, put both the error number and message for both db object to the error message
11 years ago · e70e2d8310
1 changed files with 2 additions and 0 deletions
--- 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');
 	}