From 6da91bfff33f9e472b30330620f215e9bacc3284 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 13 Nov 2006 19:12:34 +0100
Subject: [PATCH 1/2] Use mysql-test-run.pl

mysql-test/mysql-test-run-shell.sh:
  Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh
mysql-test/Makefile.am:
  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/Makefile.am                        | 20 ++++++++++++-------
 ...ql-test-run.sh => mysql-test-run-shell.sh} |  0
 2 files changed, 13 insertions(+), 7 deletions(-)
 rename mysql-test/{mysql-test-run.sh => mysql-test-run-shell.sh} (100%)

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 1e6eb12f7b2..3307b870c66 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -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 \
@@ -110,6 +111,11 @@ 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
 
 .sh:
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run-shell.sh
similarity index 100%
rename from mysql-test/mysql-test-run.sh
rename to mysql-test/mysql-test-run-shell.sh

From 1eb70558efbc61313ee0892e369343915b653ea6 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 13 Nov 2006 19:16:23 +0100
Subject: [PATCH 2/2] Remove test-force-pl-mem and add test-force-mem

---
 Makefile.am | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8d0746e6a64..ab9a7a33a44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,6 +114,12 @@ test-force:
 	./mysql-test-run --force && \
 	./mysql-test-run --ps-protocol --force
 
+test-force-mem:
+	cd mysql-test; \
+	./mysql-test-run --force --mem && \
+	./mysql-test-run --ps-protocol --force --mem
+
+
 # We are testing a new Perl version of the test script
 test-pl:
 	cd mysql-test; \
@@ -125,7 +131,3 @@ test-force-pl:
 	./mysql-test-run.pl --force && \
 	./mysql-test-run.pl --ps-protocol --force
 
-test-force-pl-mem:
-	cd mysql-test; \
-	./mysql-test-run.pl --force --mem && \
-	./mysql-test-run.pl --ps-protocol --force --mem