Commit 23b7f4b7 authored by unknown's avatar unknown
Browse files

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
parents 8da5141d 9020035f

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -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