bk commit into 4.1 tree (msvensson:1.2556)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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, 2006-11-17 13:36:10+01:00, msvensson@neptunus.(none) +1 -0
  Remove unused variables/options that does not have any effect
  Update usage description

  mysql-test/mysql-test-run.pl@stripped, 2006-11-17 13:36:09+01:00, msvensson@neptunus.(none) +3 -34
    Remove unused variables/options that does not have any effect
    Update usage description

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.145/mysql-test/mysql-test-run.pl	2006-11-17 13:36:14 +01:00
+++ 1.146/mysql-test/mysql-test-run.pl	2006-11-17 13:36:14 +01:00
@@ -233,8 +233,6 @@ our $opt_skip_im;
 
 our $opt_sleep;
 
-our $opt_sleep_time_after_restart=  1;
-our $opt_sleep_time_for_delete=    10;
 our $opt_testcase_timeout;
 our $opt_suite_timeout;
 my  $default_testcase_timeout=     15; # 15 min max
@@ -251,7 +249,6 @@ our $opt_strace_client;
 our $opt_timer= 1;
 
 our $opt_user;
-our $opt_user_test;
 
 our $opt_valgrind= 0;
 our $opt_valgrind_mysqld= 0;
@@ -273,7 +270,6 @@ our $opt_stress_test_file=     "";
 
 our $opt_wait_for_master;
 our $opt_wait_for_slave;
-our $opt_wait_timeout=  10;
 
 our $opt_warnings;
 
@@ -608,9 +604,7 @@ sub command_line_setup () {
              'start-and-exit'           => \$opt_start_and_exit,
              'timer!'                   => \$opt_timer,
              'unified-diff|udiff'       => \$opt_udiff,
-             'user-test=s'              => \$opt_user_test,
              'user=s'                   => \$opt_user,
-             'wait-timeout=i'           => \$opt_wait_timeout,
              'testcase-timeout=i'       => \$opt_testcase_timeout,
              'suite-timeout=i'          => \$opt_suite_timeout,
              'warnings|log-warnings'    => \$opt_warnings,
@@ -897,14 +891,6 @@ sub command_line_setup () {
   }
 
   # --------------------------------------------------------------------------
-  # Sleep flag
-  # --------------------------------------------------------------------------
-  if ( $opt_sleep )
-  {
-    $opt_sleep_time_after_restart= $opt_sleep;
-  }
-
-  # --------------------------------------------------------------------------
   # Big test flags
   # --------------------------------------------------------------------------
    if ( $opt_big_test )
@@ -929,8 +915,6 @@ sub command_line_setup () {
   {
     # Indicate that we are using debugger
     $glob_debugger= 1;
-    # Increase timeouts
-    $opt_wait_timeout=  300;
     if ( $opt_extern )
     {
       mtr_error("Can't use --extern when using debugger");
@@ -996,13 +980,6 @@ sub command_line_setup () {
     $opt_suite_timeout*= 6 if $opt_valgrind;
   }
 
-  # Increase times to wait for executables to start if using valgrind
-  if ( $opt_valgrind )
-  {
-    $opt_sleep_time_after_restart= 10;
-    $opt_sleep_time_for_delete= 60;
-  }
-
   if ( ! $opt_user )
   {
     if ( $opt_extern )
@@ -4745,22 +4722,14 @@ Misc options
   unified-diff | udiff  When presenting differences, use unified diff
 
   testcase-timeout=MINUTES Max test case run time (default $default_testcase_timeout)
-  suite-timeout=MINUTES    Max test suite run time (default $default_suite_timeout)
+  suite-timeout=MINUTES Max test suite run time (default $default_suite_timeout)
+  warnings | log-warnings Pass --log-warnings to mysqld
 
+  sleep=SECONDS         Passed to mysqltest, will be used as fixed sleep time
 
 Deprecated options
   with-openssl          Deprecated option for ssl
 
-
-Options not yet described, or that I want to look into more
-  local                 
-  netware               
-  sleep=SECONDS         
-
-  user-test=s           
-  wait-timeout=SECONDS  
-  warnings              
-  log-warnings          
 
 HERE
   mtr_exit(1);