Commit 6bd194d7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-4.1-rpl 

into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
parents 9cde979e 3bf9b431

mysql-test/Makefile.am

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

scripts/make_binary_distribution.sh

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ $CP mysql-test/lib/*.pl $BASE/mysql-test/lib 
$CP mysql-test/lib/*.sql $BASE/mysql-test/lib

$CP mysql-test/t/*.def $BASE/mysql-test/t

$CP mysql-test/include/*.inc $BASE/mysql-test/include

$CP mysql-test/include/*.test $BASE/mysql-test/include

$CP mysql-test/std_data/*.dat mysql-test/std_data/*.*001 \

    mysql-test/std_data/*.cnf \

    $BASE/mysql-test/std_data