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
This commit is contained in:
parent
d8fb19e169
commit
b1988b0d6f
@ -34,7 +34,7 @@ benchdir_root= $(prefix)
|
|||||||
testdir = $(benchdir_root)/mysql-test
|
testdir = $(benchdir_root)/mysql-test
|
||||||
EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
|
EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
|
||||||
EXTRA_DIST = $(EXTRA_SCRIPTS)
|
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
|
PRESCRIPTS = mysql-test-run.pl
|
||||||
test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
|
test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
|
||||||
test_DATA = std_data/client-key.pem \
|
test_DATA = std_data/client-key.pem \
|
||||||
@ -123,11 +123,6 @@ mysql-test-run:
|
|||||||
$(RM) -f mysql-test-run
|
$(RM) -f mysql-test-run
|
||||||
$(LN_S) mysql-test-run.pl 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
|
SUFFIXES = .sh
|
||||||
|
|
||||||
.sh:
|
.sh:
|
||||||
|
@ -93,7 +93,6 @@ CLEANFILES = @server_scripts@ \
|
|||||||
mysql_upgrade_shell \
|
mysql_upgrade_shell \
|
||||||
mysqld_multi \
|
mysqld_multi \
|
||||||
make_win_src_distribution \
|
make_win_src_distribution \
|
||||||
mysql_create_system_tables \
|
|
||||||
mysql_fix_privilege_tables.sql
|
mysql_fix_privilege_tables.sql
|
||||||
|
|
||||||
# mysqlbug should be distributed built so that people can report build
|
# mysqlbug should be distributed built so that people can report build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user