diff options
author | unknown <msvensson@neptunus.(none)> | 2006-11-24 12:12:25 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-11-24 12:12:25 +0100 |
commit | 87e3047501d74efd55983d6c45936f1bc3a13256 (patch) | |
tree | 857a75fef3cd023ca835be3648bb195609b13cdb /mysql-test/Makefile.am | |
parent | de9980f4c61c3fdfe7547789ec4b0a86dc49c6a0 (diff) | |
parent | 6bd194d7ca9942a5926fe98dd8f59bd5213f24fd (diff) | |
download | mariadb-git-87e3047501d74efd55983d6c45936f1bc3a13256.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
mysql-test/Makefile.am:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Manual merge of changes for RPM
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 4afab8b0281..f8bf5c490f0 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -57,6 +57,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 @@ -84,6 +85,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 |