bk commit into 5.0 tree (msvensson:1.2101)

[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
  1.2101 06/03/23 16:39:51 msvensson@shellback.(none) +1 -0
  Moved "tmpdir" and 2vardor" to the documented flags and add some documentation

  mysql-test/mysql-test-run.pl
    1.81 06/03/23 16:39:46 msvensson@shellback.(none) +11 -3
    Moved "tmpdir" and 2vardor" to the documented flags and add some documentation

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl

--- 1.80/mysql-test/mysql-test-run.pl	2006-03-23 16:22:50 +01:00
+++ 1.81/mysql-test/mysql-test-run.pl	2006-03-23 16:39:46 +01:00
@@ -619,6 +619,10 @@
              'stress-test-count=i'      => \$opt_stress_test_count,
              'stress-test-duration=i'   => \$opt_stress_test_duration,
 
+	     # Directories
+             'tmpdir=s'                 => \$opt_tmpdir,
+             'vardir=s'                 => \$opt_vardir,
+
              # Misc
              'big-test'                 => \$opt_big_test,
              'comment=s'                => \$opt_comment,
@@ -636,11 +640,9 @@
              'start-and-exit'           => \$opt_start_and_exit,
              'start-from=s'             => \$opt_start_from,
              'timer'                    => \$opt_timer,
-             'tmpdir=s'                 => \$opt_tmpdir,
              'unified-diff|udiff'       => \$opt_udiff,
              'user-test=s'              => \$opt_user_test,
              'user=s'                   => \$opt_user,
-             'vardir=s'                 => \$opt_vardir,
              'verbose'                  => \$opt_verbose,
              'wait-timeout=i'           => \$opt_wait_timeout,
              'testcase-timeout=i'       => \$opt_testcase_timeout,
@@ -3227,6 +3229,13 @@
   bench                 Run the benchmark suite FIXME
   small-bench           FIXME
 
+Options to control directories to use
+  vardir=DIR            The directory where files generated from the test run
+                        is stored(default: ./var). Specifying a ramdisk or tmpfs
+                        will speed up tests.
+  tmpdir=DIR            The directory where temporary files are stored
+                        (default: ./var/tmp).
+
 Options to control what test suites or cases to run
 
   force                 Continue to run the suite after failure
@@ -3315,7 +3324,6 @@
   old-master            
   sleep=SECONDS         
   socket=PATH           
-  tmpdir=DIR            
   user-test=s           
   wait-timeout=SECONDS  
   warnings