From b509ba6dbdbf7510d183df8d277664d7511c31b4 Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Mon, 12 Sep 2011 15:05:10 +0000 Subject: [PATCH] This should please gcov.php.net which hits error 1044 instead of 1049. --- ext/mysqli/tests/mysqli_select_db.phpt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt index ee04eacb6a..f58a19bea3 100644 --- a/ext/mysqli/tests/mysqli_select_db.phpt +++ b/ext/mysqli/tests/mysqli_select_db.phpt @@ -70,7 +70,17 @@ require_once('skipifconnectfailure.inc'); mysqli_report(MYSQLI_REPORT_OFF); mysqli_select_db($link, 'I can not imagine that this database exists'); mysqli_report(MYSQLI_REPORT_ERROR); + + ob_start(); mysqli_select_db($link, 'I can not imagine that this database exists'); + $output = ob_get_contents(); + ob_end_clean(); + if (!stristr($output, "1049") && !stristr($output, "1044") && !stristr($output, "1045")) { + /* Error: 1049 SQLSTATE: 42000 (ER_BAD_DB_ERROR) Message: Unknown database '%s' */ + /* Error: 1044 SQLSTATE: 42000 (ER_DBACCESS_DENIED_ERROR) Message: Access denied for user '%s'@'%s' to database '%s' */ + /* Error: 1045 SQLSTATE: 28000 (ER_ACCESS_DENIED_ERROR) Message: Access denied for user '%s'@'%s' (using password: %s) */ + echo $output; + } if (!$res = mysqli_query($link, "SELECT DATABASE() AS dbname")) printf("[015] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -98,7 +108,5 @@ require_once('skipifconnectfailure.inc'); --CLEAN-- --EXPECTF-- -Warning: mysqli_select_db(): (%s/%d): Unknown database '%s' in %s on line %d - Warning: mysqli_select_db(): Couldn't fetch mysqli in %s on line %d done! \ No newline at end of file -- 2.40.0