Commit 2c2334f9 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
parents cb79b922 d8ff3e7b

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_SCRIPT) $(srcdir)/t/*.sh $(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
@@ -87,6 +88,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
@@ -240,6 +240,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/t/*.def $BASE/mysql-test/t

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

    mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \