Merge 10.11 into 11.0

1 files changed, 7 insertions, 11 deletions

diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index 5ab50a4f88b..65c17801b16 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -145,6 +145,7 @@ my $opt_start_exit;
 my $start_only;
 my $file_wsrep_provider;
 my $num_saved_cores= 0;  # Number of core files saved in vardir/log/ so far.
+my $test_name_for_report;
 
 our @global_suppressions;
 
@@ -515,12 +516,9 @@ sub main {
   }
 
   if ( not @$completed ) {
-    my $test_name= mtr_grab_file($path_testlog);
-    if (defined($test_name))
+    if ($test_name_for_report)
     {
-      $test_name =~ s/^CURRENT_TEST:\s//;
-      chomp($test_name);
-      my $tinfo = My::Test->new(name => $test_name);
+      my $tinfo = My::Test->new(name => $test_name_for_report);
       $tinfo->{result}= 'MTR_RES_FAILED';
       $tinfo->{comment}=' ';
       mtr_report_test($tinfo);
@@ -3744,8 +3742,8 @@ sub resfile_report_test ($) {
 sub run_testcase ($$) {
   my ($tinfo, $server_socket)= @_;
   my $print_freq=20;
-
-  mtr_verbose("Running test:", $tinfo->{name});
+  $test_name_for_report= $tinfo->{name};
+  mtr_verbose("Running test:", $test_name_for_report);
   $ENV{'MTR_TEST_NAME'} = $tinfo->{name};
   resfile_report_test($tinfo) if $opt_resfile;
 
@@ -5134,12 +5132,10 @@ sub mysqld_start ($$) {
   if (!$rc)
   {
     # Report failure about the last test case before exit
-    my $test_name= mtr_grab_file($path_current_testlog);
-    $test_name =~ s/^CURRENT_TEST:\s//;
-    my $tinfo = My::Test->new(name => $test_name);
+    my $tinfo = My::Test->new(name => $test_name_for_report);
     $tinfo->{result}= 'MTR_RES_FAILED';
     $tinfo->{failures}= 1;
-    $tinfo->{logfile}=get_log_from_proc($mysqld->{'proc'}, $tinfo->{name});
+    $tinfo->{logfile}=get_log_from_proc($mysqld->{'proc'}, $test_name_for_report);
     report_option('verbose', 1);
     mtr_report_test($tinfo);
   }