database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@neptunus.(none)
2006-11-13 13:33:33 +01:00
parent b693d5fdb3 0ef85c5d8d
commit 3eff32965d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Makefile.am
View File

@ -65,6 +65,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;

8
mysql-test/mysql-test-run.pl
View File

@ -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,
@ -4648,9 +4648,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]