diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-02-28 13:29:48 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-02-28 13:29:48 +0200 |
| commit | 21a32d758e9f6bf9e0fb2fca6548c1e37ad1af60 (patch) | |
| tree | e05b50b2e283ecdeb7b689c60ce89560e6825552 /mysql-test/Makefile.am | |
| parent | 352beccce6144db231222f32a38595798f77fbe1 (diff) | |
| parent | 654878ac74ade2fb7e0017d0c27300acada7c3d3 (diff) | |
| download | mariadb-git-21a32d758e9f6bf9e0fb2fca6548c1e37ad1af60.tar.gz | |
Merge with 3.23 -> 4.0
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/thr_lock.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/log_event.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 84d4a5bba9a..9f0936b1264 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -27,7 +27,7 @@ CLEANFILES = $(test_SCRIPTS) dist-hook: mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \ $(distdir)/std_data - $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(distdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t $(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include $(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r $(INSTALL_DATA) $(srcdir)/std_data/*.dat $(srcdir)/std_data/*.000001 $(distdir)/std_data @@ -41,6 +41,8 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir) $(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t + $(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t $(INSTALL_DATA) $(srcdir)/r/*.result $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/r/*.require $(DESTDIR)$(testdir)/r $(INSTALL_DATA) $(srcdir)/include/*.inc $(DESTDIR)$(testdir)/include |