From 9bc0275c158740efa05174676cd1e2aa79ab41aa Mon Sep 17 00:00:00 2001
From: Aleksey Midenkov <midenok@gmail.com>
Date: Fri, 23 Dec 2022 11:45:14 +0300
Subject: MDEV-30186 Use of uninitialized value $test_name in substitution

Revert "Format properly mtr report for the test case that is not completed"
This reverts commit 0c62b6d5652a66fa654e91dd27e0a16433920e5c.

Revert "MDEV-25857: MTR should report at least last test that was executed in case of shutdown and not-completed"
This reverts commit 29e8c154172bd6b9dccd9757fddace93be6ad194.
---
 .gitignore                     |  1 -
 mysql-test/mariadb-test-run.pl | 18 ++----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5376c582985..d1a780e9e8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -514,7 +514,6 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
-*.stackdump
 
 # SQL Server files
 *.mdf
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
index 27d62400fd5..b50c5f3f2e3 100755
--- a/mysql-test/mariadb-test-run.pl
+++ b/mysql-test/mariadb-test-run.pl
@@ -515,13 +515,6 @@ sub main {
   }
 
   if ( not @$completed ) {
-    my $test_name= mtr_grab_file($path_testlog);
-    $test_name =~ s/^CURRENT_TEST:\s//;
-    chomp($test_name);
-    my $tinfo = My::Test->new(name => $test_name);
-    $tinfo->{result}= 'MTR_RES_FAILED';
-    $tinfo->{comment}=' ';
-    mtr_report_test($tinfo);
     mtr_error("Test suite aborted");
   }
 
@@ -5122,15 +5115,8 @@ sub mysqld_start ($$) {
            $opt_start_timeout, $mysqld->{'proc'}, $warn_seconds);
   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);
-    $tinfo->{result}= 'MTR_RES_FAILED';
-    $tinfo->{failures}= 1;
-    $tinfo->{logfile}=get_log_from_proc($mysqld->{'proc'}, $tinfo->{name});
-    report_option('verbose', 1);
-    mtr_report_test($tinfo);
+    my $mname= $mysqld->name();
+    mtr_error("Failed to start mysqld $mname with command $exe");
   }
   return $rc;
 }
-- 
cgit v1.2.1