diff options
| author | unknown <df@kahlann.erinye.com> | 2006-11-14 14:31:36 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-11-14 14:31:36 +0100 |
| commit | 23b7f4b78260b3869756c3b79e33548e51163f53 (patch) | |
| tree | 66a6b3e3eb8890f6c1bb4f91b18ed5256775d38c /mysql-test/Makefile.am | |
| parent | 8da5141d93ac24fe3f03581a5290a8e073b7956e (diff) | |
| parent | 9020035fa250c4398a176d09d0ebabe187f2a3b2 (diff) | |
| download | mariadb-git-23b7f4b78260b3869756c3b79e33548e51163f53.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
into kahlann.erinye.com:/home/df/mysql/build/51
mysql-test/Makefile.am:
Auto merged
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index f0bc1e9b20a..e8f00902a33 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -59,6 +59,7 @@ dist-hook: -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(distdir)/extra/binlog_tests -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(distdir)/extra/rpl_tests $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include + $(INSTALL_DATA) $(srcdir)/include/*.test $(distdir)/include $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(distdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data @@ -98,6 +99,7 @@ install-data-local: -$(INSTALL_DATA) $(srcdir)/extra/binlog_tests/*.opt $(DESTDIR)$(testdir)/extra/binlog_tests -$(INSTALL_DATA) $(srcdir)/extra/rpl_tests/*.opt $(DESTDIR)$(testdir)/extra/rpl_tests $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include + $(INSTALL_DATA) $(srcdir)/include/*.test $(DESTDIR)$(testdir)/include $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.*001 $(DESTDIR)$(testdir)/std_data $(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data |