From 39b1dbc4d2dba4454f71d055f5ca5d1ff45aa3d0 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 6 Feb 2012 20:29:13 +0100
Subject: [PATCH] make %suites hash local to mtr_cases.pm

---
 mysql-test/lib/mtr_cases.pm  | 15 ++++++++-------
 mysql-test/mysql-test-run.pl |  8 +++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 90b1adc9ac3..837030a9c3e 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -66,6 +66,7 @@ require "mtr_misc.pl";
 my $do_test_reg;
 my $skip_test_reg;
 
+my %suites;
 my $default_suite_object = do 'My/Suite.pm';
 
 sub init_pattern {
@@ -317,11 +318,11 @@ sub collect_one_suite
   #
   # Load the Suite object
   #
-  unless ($::suites{$suite}) {
+  unless ($suites{$suite}) {
     if (-f "$suitedir/suite.pm") {
-      $::suites{$suite} = do "$suitedir/suite.pm";
+      $suites{$suite} = do "$suitedir/suite.pm";
     } else {
-      $::suites{$suite} = $default_suite_object;
+      $suites{$suite} = $default_suite_object;
     }
   }
 
@@ -377,7 +378,7 @@ sub collect_one_suite
 
   my @case_names;
   {
-    my $s= $::suites{$suite};
+    my $s= $suites{$suite};
     $s = 'My::Suite' unless ref $s;
     @case_names= $s->list_cases($testdir);
   }
@@ -712,7 +713,7 @@ sub collect_one_test_case {
      name          => "$suitename.$tname",
      shortname     => $tname,
      path          => "$testdir/$filename",
-     suite         => $suitename,
+     suite         => $suites{$suitename},
     );
 
   my $result_file= "$resdir/$tname.result";
@@ -947,10 +948,10 @@ sub collect_one_test_case {
     $tinfo->{template_path}= $config;
   }
 
-  if (not ref $::suites{$tinfo->{suite}})
+  if (not ref $suites{$suitename})
   {
     $tinfo->{'skip'}= 1;
-    $tinfo->{'comment'}= $::suites{$tinfo->{suite}};
+    $tinfo->{'comment'}= $suites{$suitename};
     return $tinfo;
   }
 
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 97a9429ff4e..1d978936cc9 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -342,8 +342,6 @@ our $debug_compiled_binaries;
 
 our %mysqld_variables;
 
-our %suites;
-
 my $source_dist= 0;
 
 my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5);
@@ -4074,7 +4072,7 @@ sub config_files($) {
   my ($tinfo) = @_;
   (
     'my.cnf' => \&mycnf_create,
-    $suites{$tinfo->{suite}}->config_files()
+    $tinfo->{suite}->config_files()
   );
 }
 
@@ -4105,7 +4103,7 @@ sub fix_servers($) {
       SORT => 220,
       START => undef,
     },
-    $suites{$tinfo->{suite}}->servers()
+    $tinfo->{suite}->servers()
   );
   for ($config->groups()) {
     while (my ($re,$prop) = each %servers) {
@@ -4324,7 +4322,7 @@ sub run_testcase ($$) {
     return 1;
   }
 
-  my $test= $suites{$tinfo->{suite}}->start_test($tinfo);
+  my $test= $tinfo->{suite}->start_test($tinfo);
   # Set only when we have to keep waiting after expectedly died server
   my $keep_waiting_proc = 0;