Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools

into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools


mysql-test/lib/mtr_cases.pl:
  Auto merged

mysql-test/lib/mtr_cases.pl

@@ -186,13 +186,13 @@ sub collect_test_cases ($) {
 
     @$cases = sort { $sort_criteria{$a->{"name"}} cmp $sort_criteria{$b->{"name"}}; } @$cases;
 
-###  For debugging the sort-order
-    foreach $tinfo (@$cases)
+    if ( $::opt_script_debug )
     {
-      print $sort_criteria{$tinfo->{"name"}};
-      print " -> \t";
-      print $tinfo->{"name"};
-      print "\n";
+      # For debugging the sort-order
+      foreach $tinfo (@$cases)
+      {
+	print("$sort_criteria{$tinfo->{'name'}} -> \t$tinfo->{'name'}\n");
+      }
     }
   }