Commit 626b2734 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 821fa224 34b209db

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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 $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(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 $(distdir)/std_data

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ $CP mysql-test/mysql-test-run mysql-test/install_test_db $BASE/mysql-test/ 
$CP mysql-test/README $BASE/mysql-test/README

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

$CP mysql-test/std_data/*.dat $BASE/mysql-test/std_data

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

$CP mysql-test/t/*.test mysql-test/t/*.opt mysql-test/t/*.sh $BASE/mysql-test/t

$CP mysql-test/r/*.result mysql-test/r/*.require $BASE/mysql-test/r



$CP scripts/* $BASE/bin