From b5054a7c7b1e42a76df5feeb053cc6f38181b684 Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Wed, 23 Nov 2011 16:47:22 +0000 Subject: Fix test --- ext/mysqli/tests/mysqli_kill.phpt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt index 5706adf46d..3606fda0b1 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -44,28 +44,31 @@ require_once('skipifconnectfailure.inc'); if ($link->info != 'Records: 6 Duplicates: 0 Warnings: 0') { printf("[008] mysqlnd used to be more verbose and used to support SELECT"); } + if ($link->stat != NULL) { + printf("[009] NULL expected because of error.\n"); + } } else { if ($link->info != NULL) { - printf("[008] Time for wonders - libmysql has started to support SELECT, change test"); + printf("[010] Time for wonders - libmysql has started to support SELECT, change test"); } } mysqli_close($link); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) - printf("[009] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + printf("[011] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); mysqli_kill($link, -1); if ((!$res = mysqli_query($link, "SELECT id FROM test LIMIT 1")) || (!$tmp = mysqli_fetch_assoc($res))) { - printf("[010] Connection should not be gone, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + printf("[012] Connection should not be gone, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); } var_dump($tmp); mysqli_free_result($res); mysqli_close($link); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) - printf("[011] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + printf("[013] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); mysqli_change_user($link, "This might work if you accept anonymous users in your setup", "password", $db); mysqli_kill($link, -1); @@ -108,6 +111,8 @@ object(mysqli)#%d (%d) { %unicode|string%(%d) "%s" [%u|b%"server_version"]=> int(%d) + ["stat"]=> + %s [%u|b%"sqlstate"]=> %unicode|string%(5) "HY000" [%u|b%"protocol_version"]=> @@ -125,4 +130,4 @@ array(1) { } Warning: mysqli_kill(): processid should have positive value in %s on line %d -done! \ No newline at end of file +done! -- cgit v1.2.1