diff options
| author | unknown <serg@serg.mylan> | 2004-08-24 17:24:23 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-08-24 17:24:23 +0200 |
| commit | 46fad71c1136131ea13ff5af8d80e49325528132 (patch) | |
| tree | 35c94403332fed86012546db775d8817473f7435 /support-files | |
| parent | c04c5196b8917f36b9b07a0205ea198d75bf516b (diff) | |
| parent | 009fcf12cabf8a810a914c56b9abe8e8645dae8d (diff) | |
| download | mariadb-git-46fad71c1136131ea13ff5af8d80e49325528132.tar.gz | |
manually merged
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/binary.result:
Auto merged
mysql-test/r/truncate.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/truncate.test:
Auto merged
mysys/my_lib.c:
Auto merged
strings/my_vsnprintf.c:
Auto merged
support-files/Makefile.am:
Auto merged
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 196da3d8744..3b43f7b7911 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -22,6 +22,7 @@ EXTRA_DIST = mysql.spec.sh \ my-medium.cnf.sh \ my-large.cnf.sh \ my-huge.cnf.sh \ + my-innodb-heavy-4G \ mysql-log-rotate.sh \ mysql.server.sh \ binary-configure.sh \ @@ -34,6 +35,7 @@ pkgdata_DATA = my-small.cnf \ my-medium.cnf \ my-large.cnf \ my-huge.cnf \ + my-innodb-heavy-4G.cnf \ mysql-log-rotate \ mysql-@VERSION@.spec \ MySQL-shared-compat.spec @@ -44,6 +46,7 @@ CLEANFILES = my-small.cnf \ my-medium.cnf \ my-large.cnf \ my-huge.cnf \ + my-innodb-heavy-4G.cnf \ mysql.spec \ mysql-@VERSION@.spec \ mysql-log-rotate \ |