bk commit into 4.1 tree (msvensson:1.2624) BUG#20166

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 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:03:47+01:00, msvensson@stripped +4 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Build lib/init-db.sql from the output of mysql_create_system_tables
   - Remove mysql-test/init_db.sql and mysql-test/lib/init_db.sql
   - Leave netware/init_db.sql until 5.0 where we should soon have possibility
     to test with mysql-test-run.pl

  BitKeeper/deleted/.del-init_db.sql@stripped, 2007-02-28 15:01:02+01:00, msvensson@stripped +0 -0
    Delete: mysql-test/init_db.sql

  BitKeeper/deleted/.del-init_db.sql~a77d572c39d5a1f8@stripped, 2007-02-28 15:01:05+01:00, msvensson@stripped +0 -0
    Delete: mysql-test/lib/init_db.sql

  BitKeeper/etc/ignore@stripped, 2007-02-28 15:03:46+01:00, msvensson@stripped +1 -0
    Added mysql-test/lib/init_db.sql to the ignore list

  mysql-test/Makefile.am@stripped, 2007-02-28 15:03:46+01:00, msvensson@stripped +6 -1
    Build lib/init_db.sql from the output of mysql_create_system_tables

# 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-4.1-maint

--- 1.240/BitKeeper/etc/ignore	2006-10-24 21:02:02 +02:00
+++ 1.241/BitKeeper/etc/ignore	2007-02-28 15:03:46 +01:00
@@ -1067,3 +1067,4 @@ vio/viotest-ssl
 include/check_abi
 include/mysql_h.ic
 mysql-test/r/blackhole.log
+mysql-test/lib/init_db.sql

--- 1.59/mysql-test/Makefile.am	2007-02-02 12:01:10 +01:00
+++ 1.60/mysql-test/Makefile.am	2007-02-28 15:03:46 +01:00
@@ -35,7 +35,7 @@ testdir =	        $(benchdir_root)/mysql
 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
+GENSCRIPTS =		mysql-test-run-shell mysql-test-run install_test_db mtr lib/init_db.sql
 PRESCRIPTS =		mysql-test-run.pl
 test_SCRIPTS = 		$(GENSCRIPTS) $(PRESCRIPTS)
 test_DATA = 		std_data/client-key.pem \
@@ -118,6 +118,11 @@ 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