com php-src: Fix another failing test: ext/mysqli/tests/mysqli _change_user_old.phpt

From: Date: Fri, 15 Aug 2014 23:26:21 +0000
Subject: com php-src: Fix another failing test: ext/mysqli/tests/mysqli _change_user_old.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80553@lists.php.net to get a copy of this message
Commit: 48dc203408672380545012d9b6ee73df23e139fb Author: Keyur Govande <keyur@php.net> Fri, 15 Aug 2014 23:26:21 +0000 Parents: 7c4b5d91874ea0a69f5b65c05494056aaae81e71 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=48dc203408672380545012d9b6ee73df23e139fb Log: Fix another failing test Changed paths: M ext/mysqli/tests/mysqli_change_user_old.phpt Diff: diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt index ddb49cd..96357eb 100644 --- a/ext/mysqli/tests/mysqli_change_user_old.phpt +++ b/ext/mysqli/tests/mysqli_change_user_old.phpt @@ -48,6 +48,14 @@ if (mysqli_get_server_version($link) >= 50600) if (false !== ($tmp = mysqli_change_user($link, $user, $passwd, $db . '_unknown_really'))) printf("[009] Expecting false, got %s/%s\n", gettype($tmp), $tmp); + // Reconnect because Percona and MariaDB block any commands after 3 failed + // change_user commands + mysqli_close($link); + + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[020] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + } if (!mysqli_query($link, 'SET @mysqli_change_user_test_var=1')) printf("[010] Failed to set test variable: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -116,4 +124,4 @@ if (mysqli_get_server_version($link) >= 50600) print "done!"; ?> --EXPECTF-- -done! \ No newline at end of file +done!

« previous php.cvs (#80553) next »