diff options
| author | unknown <joerg@trift2.> | 2007-07-17 21:11:22 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-07-17 21:11:22 +0200 |
| commit | 0b0277b47a99a29bc0ac9ee8bf428081359731b5 (patch) | |
| tree | 8e9fd900c2ee6c1017c62e3dd0762fbdbe094335 | |
| parent | 035346fcff6070dae08c134094f7cd1be980492c (diff) | |
| parent | 3ec7c63645f8b6111cef864718fb8c6dfc298b0f (diff) | |
| download | mariadb-git-0b0277b47a99a29bc0ac9ee8bf428081359731b5.tar.gz | |
Merge trift2.:/MySQL/M50/bug21023-25486-5.0
into trift2.:/MySQL/M51/bug21023-25486-5.1
mysql-test/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/Makefile.am:
SCCS merged
| -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 acb9ba36bda..c783158b46c 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -26,7 +26,7 @@ EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \ valgrind.supp $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) suite GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run -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 \ std_data/cacert.pem std_data/server-cert.pem \ diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 201a922ee68..7a016670d67 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -301,7 +301,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 MCP mysql-test/lib/*.pl $BASE/mysql-test/lib diff --git a/support-files/Makefile.am b/support-files/Makefile.am index b3581d65eb0..36dcd36e25b 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.m4 \ 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 aclocaldir = $(datadir)/aclocal aclocal_DATA = mysql.m4 @@ -59,6 +61,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 |