Commit 5808eec2 authored by unknown's avatar unknown
Browse files

Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr 

into  shellback.(none):/home/msvensson/mysql/mtr/my51-mtr


BitKeeper/etc/ignore:
  auto-union
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
parents cf747aa3 8f9a867b

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ mysql-test/*.ds? 
mysql-test/*.vcproj

mysql-test/gmon.out

mysql-test/install_test_db

mysql-test/mtr

mysql-test/mysql-test-run

mysql-test/mysql-test-run.log

mysql-test/mysql_test_run_new

mysql-test/Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ benchdir_root= $(prefix) 
testdir =	        $(benchdir_root)/mysql-test

EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)

EXTRA_DIST = 		$(EXTRA_SCRIPTS) 

GENSCRIPTS =		mysql-test-run install_test_db

GENSCRIPTS =		mysql-test-run install_test_db mtr

PRESCRIPTS =		mysql-test-run.pl

test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)

test_DATA =		std_data/client-key.pem std_data/client-cert.pem \
@@ -113,6 +113,10 @@ install-data-local: 
uninstall-local:

	@RM@ -f -r $(DESTDIR)$(testdir)



# mtr - a shortcut for executing mysql-test-run.pl

mtr:

	$(RM) -f mtr

	$(LN_S) mysql-test-run.pl mtr



SUFFIXES = .sh