mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems) Removed memory leak in mysql_test if sync_with_master fails. Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed. Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
This commit is contained in:
@ -3278,9 +3278,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
|
||||
|
||||
@ -3293,6 +3293,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);
|
||||
|
||||
@ -3419,7 +3425,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)
|
||||
@ -3493,7 +3499,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.")
|
||||
}
|
||||
|
Reference in New Issue
Block a user