diff options
| author | unknown <df@kahlann.erinye.com> | 2006-11-14 14:29:58 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2006-11-14 14:29:58 +0100 |
| commit | c1ab6ade04be1fc84b6f89818be137128356ada1 (patch) | |
| tree | 8be1f91577eef40b1c7a7c762bc9c58e7fcff440 /mysql-test | |
| parent | 2433e766df996cecfdcc17468d1c3d00b735cede (diff) | |
| parent | cea3d809f65cdac8f4877da529bfad3c2066b139 (diff) | |
| download | mariadb-git-c1ab6ade04be1fc84b6f89818be137128356ada1.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
mysql-test/Makefile.am:
Auto merged
Diffstat (limited to 'mysql-test')
| -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 9f54b4fe192..74f8f478a33 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -58,6 +58,7 @@ dist-hook: $(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t $(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(distdir)/t $(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 @@ -87,6 +88,7 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r $(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 |