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

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


BitKeeper/etc/ignore:
  auto-union
mysql-test/Makefile.am:
  Manual merge 4.1 -> 5.0

.bzrignore

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

@@ -34,7 +34,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 std_data/cacert.pem \
@@ -112,6 +112,11 @@ std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F)
 std_data/server-key.pem: $(top_srcdir)/SSL/$(@F)
 	@RM@ -f $@; @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
 
 .sh: