bk commit into 5.0 tree (msvensson:1.2452) BUG#20166

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-28 15:15:38+01:00, msvensson@stripped +2 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Null merge 4.1 patch

  mysql-test/Makefile.am@stripped, 2007-02-28 15:15:36+01:00, msvensson@stripped +1 -6
    Null merge to 4.1 patch

  scripts/Makefile.am@stripped, 2007-02-28 15:15:36+01:00, msvensson@stripped +0 -1
    No need to clean mysql_create_system_tablesa anyomre

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint-bug20166

--- 1.57/scripts/Makefile.am	2007-02-28 14:26:57 +01:00
+++ 1.58/scripts/Makefile.am	2007-02-28 15:15:36 +01:00
@@ -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

--- 1.87/mysql-test/Makefile.am	2007-02-28 15:04:18 +01:00
+++ 1.88/mysql-test/Makefile.am	2007-02-28 15:15:36 +01:00
@@ -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 \
@@ -122,11 +122,6 @@ mtr:
 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