diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-07 13:01:56 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-07 13:01:56 +0100 |
| commit | 5320e2eaee95aac1992ab16d9e23ec52e4221af2 (patch) | |
| tree | 869fbcbb21d86e98f08abd5a6018e54e9626cb69 | |
| parent | 7a7e4d5d69a28f28c04cf94ac4bdbcb23b4d5d84 (diff) | |
| parent | a10cfc6a0c7fd32c3094399c78ab001d12c54d18 (diff) | |
| download | mariadb-git-5320e2eaee95aac1992ab16d9e23ec52e4221af2.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fb1b614b52d..968c4199cd3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -591,7 +591,7 @@ sub command_line_setup () { 'tmpdir=s' => \$opt_tmpdir, 'vardir=s' => \$opt_vardir, 'benchdir=s' => \$glob_mysql_bench_dir, - 'mem=s' => \$opt_mem, + 'mem' => \$opt_mem, # Misc 'comment=s' => \$opt_comment, @@ -4643,9 +4643,9 @@ 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. - mem=DIR Run testsuite in "memory" using tmpfs if + mem Run testsuite in "memory" using tmpfs if available(default: /dev/shm) - reads from MTR_MEM environment variable + reads path from MTR_MEM environment variable Options to control what test suites or cases to run |