bk commit into 4.1 tree (msvensson:1.2559)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-13 19:12:34+01:00, msvensson@neptunus.(none) +2 -0
  Use mysql-test-run.pl

  mysql-test/Makefile.am@stripped, 2006-11-13 19:12:33+01:00, msvensson@neptunus.(none) +13 -7
    Remove build of mysql_test_run_new
    Symlink mysql-test-run.pl to mysql-test-run
    Rename mysql-test-run.sh to mysql-test-run-shell.sh

  mysql-test/mysql-test-run-shell.sh@stripped, 2006-11-13 19:10:16+01:00,
msvensson@neptunus.(none) +0 -0
    Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.55/mysql-test/Makefile.am	2006-11-13 19:12:37 +01:00
+++ 1.56/mysql-test/Makefile.am	2006-11-13 19:12:37 +01:00
@@ -33,19 +33,20 @@ endif
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh $(PRESCRIPTS)
-EXTRA_DIST = 		$(EXTRA_SCRIPTS) 
-GENSCRIPTS =		mysql-test-run install_test_db mtr
+EXTRA_DIST = 		$(EXTRA_SCRIPTS)
+GENSCRIPTS =		mysql-test-run-shell 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 \
-	std_data/server-cert.pem std_data/server-key.pem 
+test_DATA = 		std_data/client-key.pem \
+			std_data/client-cert.pem \
+			std_data/cacert.pem \
+			std_data/server-cert.pem \
+			std_data/server-key.pem
 CLEANFILES = 		$(GENSCRIPTS) $(test_DATA)
 
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..
-EXTRA_PROGRAMS =	mysql_test_run_new
-noinst_HEADERS =	my_manage.h
-mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c my_create_tables.c
 
+noinst_HEADERS =	my_manage.h
 
 dist-hook:
 	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \
@@ -109,6 +110,11 @@ std_data/server-key.pem:
 mtr:
 	$(RM) -f mtr
 	$(LN_S) mysql-test-run.pl mtr
+
+# mysql-test-run - a shortcut for executing mysql-test-run.pl
+mysql-test-run:
+	$(RM) -f mysql-test-run
+	$(LN_S) mysql-test-run.pl mysql-test-run
 
 SUFFIXES = .sh