MDEV-28931 --verbose option is too verbose

GetOpt::Long bundling option for convenient one-char verbosity levels:

  -v    General verbosity (file and execute operations)
  -vv   High verbosity (algorithmic considerations)
  -vvv  Debug verbosity (anything else)

2 files changed, 12 insertions, 12 deletions

diff --git a/mysql-test/lib/v1/mtr_cases.pl b/mysql-test/lib/v1/mtr_cases.pl
index faa673a9304..cc190cb39f7 100644
--- a/mysql-test/lib/v1/mtr_cases.pl
+++ b/mysql-test/lib/v1/mtr_cases.pl
@@ -126,19 +126,19 @@ sub collect_test_cases ($) {
       {
 	my $base_name= $1;
 	my $idx= $2;
-	mtr_verbose("$test_name =>  $base_name idx=$idx");
+	mtr_verbose2("$test_name =>  $base_name idx=$idx");
 	if ( $idx > 1 )
 	{
 	  $idx-= 1;
 	  $base_name= "$base_name$idx";
-	  mtr_verbose("New basename $base_name");
+	  mtr_verbose2("New basename $base_name");
 	}
 
 	foreach my $tinfo2 (@$cases)
 	{
 	  if ( $tinfo2->{'name'} eq $base_name )
 	  {
-	    mtr_verbose("found dependent test $tinfo2->{'name'}");
+	    mtr_verbose2("found dependent test $tinfo2->{'name'}");
 	    $depend_on_test_name=$base_name;
 	  }
 	}
@@ -146,7 +146,7 @@ sub collect_test_cases ($) {
 
       if ( defined $depend_on_test_name )
       {
-	mtr_verbose("Giving $test_name same critera as $depend_on_test_name");
+	mtr_verbose2("Giving $test_name same critera as $depend_on_test_name");
 	$sort_criteria{$test_name} = $sort_criteria{$depend_on_test_name};
       }
       else
@@ -224,14 +224,14 @@ sub collect_one_suite($)
   my $suite= shift;  # Test suite name
   my @cases;  # Array of hash
 
-  mtr_verbose("Collecting: $suite");
+  mtr_verbose2("Collecting: $suite");
 
   my $suitedir= "$::glob_mysql_test_dir"; # Default
   if ( $suite ne "main" )
   {
     $suitedir= mtr_path_exists("$suitedir/suite/$suite",
 			       "$suitedir/$suite");
-    mtr_verbose("suitedir: $suitedir");
+    mtr_verbose2("suitedir: $suitedir");
   }
 
   my $testdir= "$suitedir/t";
@@ -363,7 +363,7 @@ sub collect_one_suite($)
     if (@::opt_combinations)
     {
       # take the combination from command-line
-      mtr_verbose("Take the combination from command line");
+      mtr_verbose2("Take the combination from command line");
       foreach my $combination (@::opt_combinations) {
 	my $comb= {};
 	$comb->{name}= $combination;
@@ -374,7 +374,7 @@ sub collect_one_suite($)
     elsif (-f $combination_file )
     {
       # Read combinations file in my.cnf format
-      mtr_verbose("Read combinations file");
+      mtr_verbose2("Read combinations file");
       my $config= My::Config->new($combination_file);
 
       foreach my $group ($config->groups()) {
@@ -605,7 +605,7 @@ sub collect_one_test_case($$$$$$$$$) {
   # Add suite opts
   foreach my $opt ( @$suite_opts )
   {
-    mtr_verbose($opt);
+    mtr_verbose2($opt);
     push(@{$tinfo->{'master_opt'}}, $opt);
     push(@{$tinfo->{'slave_opt'}}, $opt);
   }
diff --git a/mysql-test/lib/v1/mtr_timer.pl b/mysql-test/lib/v1/mtr_timer.pl
index 630a93ca7dc..98dc27b3f0f 100644
--- a/mysql-test/lib/v1/mtr_timer.pl
+++ b/mysql-test/lib/v1/mtr_timer.pl
@@ -80,7 +80,7 @@ sub mtr_timer_start($$$) {
     if ( $tpid )
     {
       # Parent, record the information
-      mtr_verbose("Starting timer for '$name',",
+      mtr_verbose2("Starting timer for '$name',",
 		  "duration: $duration, pid: $tpid");
       $timers->{'timers'}->{$name}->{'pid'}= $tpid;
       $timers->{'timers'}->{$name}->{'duration'}= $duration;
@@ -96,13 +96,13 @@ sub mtr_timer_start($$$) {
       $SIG{INT}= 'DEFAULT';
 
       $SIG{TERM}= sub {
-	mtr_verbose("timer $$ woke up, exiting!");
+	mtr_verbose2("timer $$ woke up, exiting!");
 	exit(0);
       };
 
       $0= "mtr_timer(timers,$name,$duration)";
       sleep($duration);
-      mtr_verbose("timer $$ expired after $duration seconds");
+      mtr_verbose2("timer $$ expired after $duration seconds");
       exit(0);
     }
   }