Commit 5c52c1ce authored by unknown's avatar unknown

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


include/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
parents de8f1500 e5d88949
...@@ -67,6 +67,7 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ ...@@ -67,6 +67,7 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
if [ @ICHECK@ != no ] ; then \ if [ @ICHECK@ != no ] ; then \
@ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \
@ICHECK@ --compare mysql_h.ic $@.ic; \ @ICHECK@ --compare mysql_h.ic $@.ic; \
$(RM) -f $@.ic; \
fi; \ fi; \
touch abi_check; touch abi_check;
......
...@@ -591,7 +591,7 @@ sub command_line_setup () { ...@@ -591,7 +591,7 @@ sub command_line_setup () {
'tmpdir=s' => \$opt_tmpdir, 'tmpdir=s' => \$opt_tmpdir,
'vardir=s' => \$opt_vardir, 'vardir=s' => \$opt_vardir,
'benchdir=s' => \$glob_mysql_bench_dir, 'benchdir=s' => \$glob_mysql_bench_dir,
'mem:s' => \$opt_mem, 'mem' => \$opt_mem,
# Misc # Misc
'comment=s' => \$opt_comment, 'comment=s' => \$opt_comment,
...@@ -4654,9 +4654,9 @@ Options to control directories to use ...@@ -4654,9 +4654,9 @@ Options to control directories to use
vardir=DIR The directory where files generated from the test run vardir=DIR The directory where files generated from the test run
is stored (default: ./var). Specifying a ramdisk or is stored (default: ./var). Specifying a ramdisk or
tmpfs will speed up tests. tmpfs will speed up tests.
mem[=DIR] Run testsuite in "memory" using tmpfs or ramdisk mem Run testsuite in "memory" using tmpfs or ramdisk
Attempts to use DIR first if specified else Attempts to find a suitable location
uses as builtin list of standard locations using a builtin list of standard locations
for tmpfs (/dev/shm) for tmpfs (/dev/shm)
The option can also be set using environment The option can also be set using environment
variable MTR_MEM=[DIR] variable MTR_MEM=[DIR]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment