Skip to content

M
mariadb
Commit 6e02e19b authored by mysqldev@mysql.com's avatar mysqldev@mysql.com
Browse files
Options

Merge mysql.com:/home/mysqldev/tulin/mysql-4.1 

into mysql.com:/home/mysqldev/tulin/mysql-5.0
parents 92a99d80 e70445d3
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
support-files/Makefile.am
View file @ 6e02e19b
...@@ -27,7 +27,8 @@ EXTRA_DIST = mysql.spec.sh \ ...@@ -27,7 +27,8 @@ EXTRA_DIST = mysql.spec.sh \
mysql.server.sh \ mysql.server.sh \
binary-configure.sh \ binary-configure.sh \
magic \ magic \
MySQL-shared-compat.spec.sh MySQL-shared-compat.spec.sh \
ndb-config-2-node.ini.sh
SUBDIRS = MacOSX SUBDIRS = MacOSX
...@@ -38,7 +39,8 @@ pkgdata_DATA = my-small.cnf \ ...@@ -38,7 +39,8 @@ pkgdata_DATA = my-small.cnf \
my-innodb-heavy-4G.cnf \ my-innodb-heavy-4G.cnf \
mysql-log-rotate \ mysql-log-rotate \
mysql-@VERSION@.spec \ mysql-@VERSION@.spec \
MySQL-shared-compat.spec MySQL-shared-compat.spec \
ndb-config-2-node.ini
pkgdata_SCRIPTS = mysql.server pkgdata_SCRIPTS = mysql.server
...@@ -52,7 +54,8 @@ CLEANFILES = my-small.cnf \ ...@@ -52,7 +54,8 @@ CLEANFILES = my-small.cnf \
mysql-log-rotate \ mysql-log-rotate \
mysql.server \ mysql.server \
binary-configure \ binary-configure \
MySQL-shared-compat.spec MySQL-shared-compat.spec \
ndb-config-2-node.ini
mysql-@VERSION@.spec: mysql.spec mysql-@VERSION@.spec: mysql.spec
rm -f $@ rm -f $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7