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 /support-files | |
| 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
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
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 |