database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug #46327 MTR2 prevents gcov data accumulation

Browse Source 
mysqladmin fails on Linux in 6.0 without --character-sets-dir
Also added timeout for server shutdown, hope this will solve it
This commit is contained in:
Bjorn Munch
2009-10-06 10:35:35 +02:00
parent bd3e299482
commit a0ed9a389d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/mysql-test-run.pl
View File

@ -738,6 +738,7 @@ sub run_worker ($) {
}
elsif ($line eq 'BYE'){
mtr_report("Server said BYE");
stop_all_servers($opt_shutdown_timeout);
exit(0);
}
else {
@ -3435,14 +3436,14 @@ sub run_testcase ($) {
my $check_res;
if ( restart_forced_by_test() )
{
stop_all_servers();
stop_all_servers($opt_shutdown_timeout);
}
elsif ( $opt_check_testcases and
$check_res= check_testcase($tinfo, "after"))
{
if ($check_res == 1) {
# Test case had sideeffects, not fatal error, just continue
stop_all_servers();
stop_all_servers($opt_shutdown_timeout);
mtr_report("Resuming tests...\n");
}
else {
@ -4083,6 +4084,7 @@ sub mysqld_stop {
mtr_init_args(\$args);
mtr_add_arg($args, "--no-defaults");
mtr_add_arg($args, "--character-sets-dir=%s", $mysqld->value('character-sets-dir'));
mtr_add_arg($args, "--user=%s", $opt_user);
mtr_add_arg($args, "--password=");
mtr_add_arg($args, "--port=%d", $mysqld->value('port'));
@ -4286,11 +4288,12 @@ sub mysqld_start ($$) {
sub stop_all_servers () {
my $shutdown_timeout = $_[0] or 0;
mtr_verbose("Stopping all servers...");
# Kill all started servers
My::SafeProcess::shutdown(0, # shutdown timeout 0 => kill
My::SafeProcess::shutdown($shutdown_timeout,
started(all_servers()));
# Remove pidfiles