From e44d995fa92c562e71e7fe65d6054e0383f493a0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Jul 2007 16:25:32 +0200 Subject: [PATCH 1/2] Ensure "mysql-stress-test.pl" is included in both "tar.gz" and RPM packages. Fixing bug#21023: "mysql-stress-test.pl" missing in builds mysql-test/Makefile.am: Ensure "mysql-stress-test.pl" is handled by "make install" in the "mysql-test" directory. This should get the script into the result tree of a RPM build. Fixing bug#21023. scripts/make_binary_distribution.sh: Copy "mysql-test/mysql-stress-test.pl" into a binary distribution ("tar.gz" and derived formats). Fixing bug#21023. --- mysql-test/Makefile.am | 2 +- scripts/make_binary_distribution.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index ebc2bbb83e8..1920a68b21b 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -35,7 +35,7 @@ testdir = $(benchdir_root)/mysql-test EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) suite GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr -PRESCRIPTS = mysql-test-run.pl +PRESCRIPTS = mysql-test-run.pl mysql-stress-test.pl test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) test_DATA = std_data/client-key.pem \ std_data/client-cert.pem \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 77f51c51c19..94b4019cd1e 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -284,7 +284,8 @@ rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD copyfileto $BASE/mysql-test \ mysql-test/mysql-test-run mysql-test/install_test_db \ mysql-test/mysql-test-run.pl mysql-test/README \ - mysql-test/valgrind.supp \ + mysql-test/mysql-stress-test.pl \ + mysql-test/valgrind.supp \ netware/mysql_test_run.nlm netware/install_test_db.ncf $CP mysql-test/lib/*.pl $BASE/mysql-test/lib From 3ec7c63645f8b6111cef864718fb8c6dfc298b0f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Jul 2007 19:27:31 +0200 Subject: [PATCH 2/2] Handle "support-files/mysqld_multi.server.sh" like other shell scripts. Fixing bug#25486: mysqld_multi.server.sh missing from builds support-files/Makefile.am: Handle "mysqld_multi.server.sh" like other shell scripts. Fixing bug#25486. --- support-files/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/support-files/Makefile.am b/support-files/Makefile.am index af835bf350e..b9d6fde742a 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -25,6 +25,7 @@ EXTRA_DIST = mysql.spec.sh \ my-innodb-heavy-4G.cnf.sh \ mysql-log-rotate.sh \ mysql.server.sh \ + mysqld_multi.server.sh \ binary-configure.sh \ magic \ MySQL-shared-compat.spec.sh \ @@ -42,7 +43,8 @@ pkgdata_DATA = my-small.cnf \ binary-configure \ ndb-config-2-node.ini -pkgdata_SCRIPTS = mysql.server +pkgdata_SCRIPTS = mysql.server \ + mysqld_multi.server noinst_DATA = mysql-@VERSION@.spec \ MySQL-shared-compat.spec @@ -56,6 +58,7 @@ CLEANFILES = my-small.cnf \ mysql-@VERSION@.spec \ mysql-log-rotate \ mysql.server \ + mysqld_multi.server \ binary-configure \ MySQL-shared-compat.spec \ ndb-config-2-node.ini