Commit 431753ec authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/dlenev/src/mysql-5.0-repl
parents 92713c00 bf1f78c1

mysql-test/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ dist-hook: 
	$(INSTALL_DATA) $(srcdir)/std_data/des_key_file $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
@@ -89,6 +90,7 @@ install-data-local: 
	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib

scripts/make_binary_distribution.sh

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ $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 \

    mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \

    mysql-test/std_data/*.cnf \

    $BASE/mysql-test/std_data

$CP mysql-test/t/*.test mysql-test/t/*.disabled mysql-test/t/*.opt \

    mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t