database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge siva.hindu.god:/home/tsmith/m/bk/51

Browse Source 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
This commit is contained in:
tsmith@siva.hindu.god
2007-04-18 14:55:42 -06:00
parent 77dcfdd8e7 b465b30847
commit 9232def96b
132 changed files with 2575 additions and 1121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3275,9 +3275,9 @@ sub do_after_run_mysqltest($)
}
sub run_testcase_mark_logs($)
sub run_testcase_mark_logs($$)
{
my ($log_msg)= @_;
my ($tinfo, $log_msg)= @_;
# Write a marker to all log files
@@ -3290,6 +3290,12 @@ sub run_testcase_mark_logs($)
mtr_tofile($mysqld->{path_myerr}, $log_msg);
}
if ( $tinfo->{'component_id'} eq 'im')
{
mtr_tofile($instance_manager->{path_err}, $log_msg);
mtr_tofile($instance_manager->{path_log}, $log_msg);
}
# ndbcluster log file
mtr_tofile($path_ndb_testrun_log, $log_msg);
@@ -3416,7 +3422,7 @@ sub run_testcase ($) {
}
# Write to all log files to indicate start of testcase
run_testcase_mark_logs("CURRENT_TEST: $tinfo->{name}\n");
run_testcase_mark_logs($tinfo, "CURRENT_TEST: $tinfo->{name}\n");
my $died= mtr_record_dead_children();
if ($died or $master_restart or $slave_restart)
@@ -3490,7 +3496,7 @@ sub run_testcase ($) {
# Stop Instance Manager if we are processing an IM-test case.
# ----------------------------------------------------------------------
if ( $tinfo->{'component_id'} eq 'im' and
!mtr_im_stop($instance_manager, $tinfo->{'name'}) )
!mtr_im_stop($instance_manager, $tinfo->{'name'}))
{
mtr_error("Failed to stop Instance Manager.")
}