Commit b1988b0d authored by unknown's avatar unknown
Browse files

Bug#20166 mysql-test-run.pl does not test system privilege tables creation 

 - Null merge 4.1 patch


mysql-test/Makefile.am:
  Null merge to 4.1 patch
scripts/Makefile.am:
  No need to clean mysql_create_system_tablesa anyomre
parent d8fb19e1

mysql-test/Makefile.am

+1 −6
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ benchdir_root= $(prefix) 
testdir =	        $(benchdir_root)/mysql-test

EXTRA_SCRIPTS = 	mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)

EXTRA_DIST = 		$(EXTRA_SCRIPTS)

GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr lib/init_db.sql

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

PRESCRIPTS =		mysql-test-run.pl

test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)

test_DATA = 		std_data/client-key.pem \
@@ -123,11 +123,6 @@ mysql-test-run: 
	$(RM) -f mysql-test-run

	$(LN_S) mysql-test-run.pl mysql-test-run



# Build init_db.sql by executing mysql_create_system_tables

lib/init_db.sql:

	$(top_builddir)/scripts/mysql_create_system_tables \

          test . \@HOSTNAME\@ > lib/init_db.sql



SUFFIXES = .sh



.sh:

scripts/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ CLEANFILES = @server_scripts@ \ 
			mysql_upgrade_shell \

			mysqld_multi \

			make_win_src_distribution \

			mysql_create_system_tables \

			mysql_fix_privilege_tables.sql



# mysqlbug should be distributed built so that people can report build