diff options
| author | unknown <mysqldev@mysql.com> | 2005-02-03 17:58:29 +0100 |
|---|---|---|
| committer | unknown <mysqldev@mysql.com> | 2005-02-03 17:58:29 +0100 |
| commit | 4b027f5b998e9409449d4370df790040a911d13a (patch) | |
| tree | 717859da028c5a5558d82d605cb8dd3a743c8234 | |
| parent | 6a8608206f58b5fdbe94e8e0e15694cf27ac2353 (diff) | |
| parent | e244a3a9b4a9d9fd9dad63338ead667cf4b9a959 (diff) | |
| download | mariadb-git-4b027f5b998e9409449d4370df790040a911d13a.tar.gz | |
Merge mysql.com:/home/mysqldev/tulin/mysql-4.1
into mysql.com:/home/mysqldev/tulin/mysql-5.0
| -rw-r--r-- | support-files/Makefile.am | 9 | ||||
| -rw-r--r-- | support-files/ndb-config-2-node.ini.sh (renamed from support-files/ndb-config-2-node.ini) | 0 |
2 files changed, 6 insertions, 3 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 7ae1071f9ec..0a6077f0efc 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -27,7 +27,8 @@ EXTRA_DIST = mysql.spec.sh \ mysql.server.sh \ binary-configure.sh \ magic \ - MySQL-shared-compat.spec.sh + MySQL-shared-compat.spec.sh \ + ndb-config-2-node.ini.sh SUBDIRS = MacOSX @@ -38,7 +39,8 @@ pkgdata_DATA = my-small.cnf \ my-innodb-heavy-4G.cnf \ mysql-log-rotate \ mysql-@VERSION@.spec \ - MySQL-shared-compat.spec + MySQL-shared-compat.spec \ + ndb-config-2-node.ini pkgdata_SCRIPTS = mysql.server @@ -52,7 +54,8 @@ CLEANFILES = my-small.cnf \ mysql-log-rotate \ mysql.server \ binary-configure \ - MySQL-shared-compat.spec + MySQL-shared-compat.spec \ + ndb-config-2-node.ini mysql-@VERSION@.spec: mysql.spec rm -f $@ diff --git a/support-files/ndb-config-2-node.ini b/support-files/ndb-config-2-node.ini.sh index be80f1dd0b3..be80f1dd0b3 100644 --- a/support-files/ndb-config-2-node.ini +++ b/support-files/ndb-config-2-node.ini.sh |