diff options
| author | lars@mysql.com/black.(none) <> | 2006-11-15 12:39:21 +0100 |
|---|---|---|
| committer | lars@mysql.com/black.(none) <> | 2006-11-15 12:39:21 +0100 |
| commit | a6801d4fe44b8471c7f1c51f6a9e7945a533716b (patch) | |
| tree | 6e3a11da841cd84a4dd01dec6a8c7513597bf43f /mysql-test | |
| parent | 5235785b2e21c28869d25ddc8d8e3f728a1acd9c (diff) | |
| parent | 5d8525c6f7c0a4ac6dc24e717c6ebb74c5d6f6ba (diff) | |
| download | mariadb-git-a6801d4fe44b8471c7f1c51f6a9e7945a533716b.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-4.1-rpl
into mysql.com:/home/bk/MERGE/mysql-4.1-merge
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 1e6eb12f7b2..9fb66fecfa8 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -55,6 +55,7 @@ dist-hook: -$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t $(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(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 @@ -82,6 +83,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 |