diff options
| author | unknown <joerg@trift2.> | 2007-07-17 21:44:36 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-07-17 21:44:36 +0200 |
| commit | 6c0d8d19317c42a14efbc7a8540e9c67f3fbbfcb (patch) | |
| tree | 28a04a0534c3e8cfddbed3b35607fd974c0070df | |
| parent | aea5f9d0b5650f9cc368584d40117f240935a73e (diff) | |
| parent | f66354cc87fe938ca041de60a32c01c6995543b1 (diff) | |
| download | mariadb-git-6c0d8d19317c42a14efbc7a8540e9c67f3fbbfcb.tar.gz | |
Merge trift2.:/MySQL/M50/bug21023-25486-5.0
into trift2.:/MySQL/M50/push-5.0
| -rw-r--r-- | mysql-test/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 3 | ||||
| -rw-r--r-- | support-files/Makefile.am | 5 |
3 files changed, 7 insertions, 3 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 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 |