bk commit into 5.0 tree (msvensson:1.2567)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-02 10:27:09+01:00, msvensson@shellback.(none) +4 -0
  Remove --script-debug and instead output that info when --verbose is used two times
  Add missing parameter to run_check_testcase_all

  mysql-test/lib/My/SafeProcess.pm@stripped, 2007-11-02 10:27:07+01:00, msvensson@shellback.(none) +4 -3
    Print extra debug info when verbose level is 2

  mysql-test/lib/mtr_cases.pl@stripped, 2007-11-02 10:27:06+01:00, msvensson@shellback.(none) +6 -8
    Remove --script-debug and instead output that info when --verbose is used two times

  mysql-test/lib/mtr_report.pl@stripped, 2007-11-02 10:27:06+01:00, msvensson@shellback.(none) +1 -2
    Remove --script-debug and instead output that info when --verbose is used two times

  mysql-test/mysql-test-run.pl@stripped, 2007-11-02 10:27:06+01:00, msvensson@shellback.(none) +4 -7
    Remove --script-debug and instead output that info when --verbose is used two times
    Add missing parameter to run_check_testcase_all

diff -Nrup a/mysql-test/lib/My/SafeProcess.pm b/mysql-test/lib/My/SafeProcess.pm
--- a/mysql-test/lib/My/SafeProcess.pm	2007-10-31 15:31:12 +01:00
+++ b/mysql-test/lib/My/SafeProcess.pm	2007-11-02 10:27:07 +01:00
@@ -151,8 +151,7 @@ sub new {
   my @safe_args;
   push(@safe_args, $safe_script) if defined $safe_script;
 
-  #push(@safe_args, "--verbose") if defined $verbose and $verbose > 0;
-  push(@safe_args, "--verbose"); # MASV temporary always on for safe_process
+  push(@safe_args, "--verbose") if $verbose > 0;
 
   # Point the safe_process at the right parent if running on cygwin
   push(@safe_args, "--parent-pid=".Cygwin::pid_to_winpid($$)) if IS_CYGWIN;
@@ -160,7 +159,9 @@ sub new {
   push(@safe_args, "--");
   push(@safe_args, $path); # The program safe_process should execute
   push(@safe_args, @$$args);
-  #print $safe_path, " ", join(" ", @safe_args), "\n";
+
+  print "### safe_path: ", $safe_path, " ", join(" ", @safe_args), "\n"
+    if $verbose > 1;
 
   my ($pid, $winpid)= create_process(
 			  path      => $safe_path,
diff -Nrup a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
--- a/mysql-test/lib/mtr_cases.pl	2007-11-01 11:03:45 +01:00
+++ b/mysql-test/lib/mtr_cases.pl	2007-11-02 10:27:06 +01:00
@@ -147,14 +147,12 @@ sub collect_test_cases ($) {
       $sort_criteria{$a->{'name'}} . $a->{'name'} cmp
 	$sort_criteria{$b->{'name'}} . $b->{'name'}; } @$cases;
 
-    if ( $::opt_script_debug )
-    {
-      # For debugging the sort-order
-      foreach my $tinfo (@$cases)
-      {
-	print("$sort_criteria{$tinfo->{'name'}} -> \t$tinfo->{'name'}\n");
-      }
-    }
+    # For debugging the sort-order
+    # foreach my $tinfo (@$cases)
+    # {
+    #   print("$sort_criteria{$tinfo->{'name'}} -> \t$tinfo->{'name'}\n");
+    # }
+
   }
 
   return $cases;
diff -Nrup a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
--- a/mysql-test/lib/mtr_report.pl	2007-10-29 10:49:25 +01:00
+++ b/mysql-test/lib/mtr_report.pl	2007-11-02 10:27:06 +01:00
@@ -393,8 +393,7 @@ sub mtr_child_error (@) {
 }
 
 sub mtr_debug (@) {
-  # Only print if --script-debug is used
-  if ( $::opt_script_debug )
+  if ( $::opt_verbose > 1 )
   {
     _mtr_log("###: ", @_);
     print STDERR "####: ",join(" ", @_),"\n";
diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-10-31 18:24:55 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-11-02 10:27:06 +01:00
@@ -116,7 +116,6 @@ our $default_vardir;
 our $opt_usage;
 our $opt_suite= "main";
 
-our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 
 my $exe_master_mysqld;
@@ -572,7 +571,6 @@ sub command_line_setup () {
              'fast'                     => \$opt_fast,
              'reorder'                  => \$opt_reorder,
              'enable-disabled'          => \$opt_enable_disabled,
-             'script-debug'             => \$opt_script_debug,
              'verbose+'                 => \$opt_verbose,
              'sleep=i'                  => \$opt_sleep,
              'socket=s'                 => \$opt_socket,
@@ -3047,7 +3045,7 @@ sub do_before_run_mysqltest($)
 }
 
 
-sub run_check_testcase_all($)
+sub run_check_testcase_all($$)
 {
   my ($tinfo, $mode)= @_;
 
@@ -3188,7 +3186,7 @@ sub run_testcase ($) {
   my $test_timeout_proc= My::SafeProcess->timer($opt_testcase_timeout * 60);
 
   do_before_run_mysqltest($tinfo);
-  run_check_testcase_all("before");
+  run_check_testcase_all($tinfo, "before");
 
   my $test= start_mysqltest($tinfo);
 
@@ -3225,7 +3223,7 @@ sub run_testcase ($) {
     {
       mtr_report_test_passed($tinfo);
 
-      run_check_testcase_all("after");
+      run_check_testcase_all($tinfo, "after");
     }
     elsif ( $res == 62 )
     {
@@ -4793,8 +4791,7 @@ Misc options
 
   comment=STR           Write STR to the output
   notimer               Don't show test case execution time
-  script-debug          Debug this script itself
-  verbose               More verbose output
+  verbose               More verbose output(use multiple times for even more)
   start-and-exit        Only initialize and start the servers, using the
                         startup settings for the specified test case (if any)
   start-dirty           Only start the servers (without initialization) for