diff options
| author | msvensson@neptunus.(none) <> | 2006-11-13 13:36:50 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-13 13:36:50 +0100 |
| commit | 10d4ecfbe677b8d17a96ca66525c7613de7bd260 (patch) | |
| tree | d0b561ba1f44135a3d3f9432c382f1373d6dec30 | |
| parent | 4a28dcecea06a749a9fa1d6df52b59cadf640f85 (diff) | |
| parent | 3eff32965dc104cc6abec1d01756c103e90304f9 (diff) | |
| download | mariadb-git-10d4ecfbe677b8d17a96ca66525c7613de7bd260.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index af061f80ff2..31d5946dde6 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -67,6 +67,7 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ if [ @ICHECK@ != no ] ; then \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ @ICHECK@ --compare mysql_h.ic $@.ic; \ + $(RM) -f $@.ic; \ fi; \ touch abi_check; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 954a2d89518..aad57f4b887 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, @@ -4654,9 +4654,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 or ramdisk - Attempts to use DIR first if specified else - uses as builtin list of standard locations + mem Run testsuite in "memory" using tmpfs or ramdisk + Attempts to find a suitable location + using a builtin list of standard locations for tmpfs (/dev/shm) The option can also be set using environment variable MTR_MEM=[DIR] |