Commit aa03d369 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/bug21023-25486-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 1c19f191 9d55f51b

mysql-test/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ testdir = $(benchdir_root)/mysql-test 
EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)

EXTRA_DIST = 		$(EXTRA_SCRIPTS) suite

GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr

PRESCRIPTS =		mysql-test-run.pl

PRESCRIPTS =		mysql-test-run.pl mysql-stress-test.pl

test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)

test_DATA = 		std_data/client-key.pem \

			std_data/client-cert.pem \

scripts/make_binary_distribution.sh

+2 −1
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ rm -f $MYSQL_SHARE/Makefile* $MYSQL_SHARE/*/*.OLD 
copyfileto $BASE/mysql-test \

         mysql-test/mysql-test-run mysql-test/install_test_db \

         mysql-test/mysql-test-run.pl mysql-test/README \

         mysql-test/mysql-stress-test.pl \

         mysql-test/valgrind.supp \

         netware/mysql_test_run.nlm netware/install_test_db.ncf

support-files/Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ EXTRA_DIST = mysql.spec.sh \ 
			my-innodb-heavy-4G.cnf.sh \

			mysql-log-rotate.sh \

			mysql.server.sh \

			mysqld_multi.server.sh \

			binary-configure.sh \

			magic \

			MySQL-shared-compat.spec.sh \
@@ -42,7 +43,8 @@ pkgdata_DATA = my-small.cnf \ 
			binary-configure \

			ndb-config-2-node.ini



pkgdata_SCRIPTS =	mysql.server

pkgdata_SCRIPTS =	mysql.server \

			mysqld_multi.server



noinst_DATA = mysql-@VERSION@.spec \

			MySQL-shared-compat.spec
@@ -56,6 +58,7 @@ CLEANFILES = my-small.cnf \ 
			mysql-@VERSION@.spec \

			mysql-log-rotate \

			mysql.server \

			mysqld_multi.server \

			binary-configure \

			MySQL-shared-compat.spec \

			ndb-config-2-node.ini