1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-4.1-maint

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
This commit is contained in:
unknown 2006-09-01 10:26:01 +02:00
commit 6453d413da
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.bzrignore
View File

@ -1059,3 +1059,4 @@ vio/test-sslserver
vio/viotest-ssl vio/viotest-ssl
libmysql/libmysql.ver libmysql/libmysql.ver
libmysqld/sql_locale.cc libmysqld/sql_locale.cc
mysql-test/mtr

7
mysql-test/Makefile.am
View File

@ -34,7 +34,7 @@ benchdir_root= $(prefix)
testdir = $(benchdir_root)/mysql-test testdir = $(benchdir_root)/mysql-test
EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS) EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS)
EXTRA_DIST = $(EXTRA_SCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS)
GENSCRIPTS = mysql-test-run install_test_db GENSCRIPTS = mysql-test-run install_test_db mtr
PRESCRIPTS = mysql-test-run.pl PRESCRIPTS = mysql-test-run.pl
test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \ test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \
@ -105,6 +105,11 @@ std_data/server-cert.pem:
std_data/server-key.pem: std_data/server-key.pem:
@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
# mtr - a shortcut for executing mysql-test-run.pl
mtr:
$(RM) -f mtr
$(LN_S) mysql-test-run.pl mtr
SUFFIXES = .sh SUFFIXES = .sh
.sh: .sh: