bk commit into 5.0 tree (msvensson:1.2296)

[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, 2006-11-10 17:04:54+01:00, msvensson@neptunus.(none) +3 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug20166/my41-bug20166
  into  neptunus.(none):/home/msvensson/mysql/bug20166/my50-bug20166
  MERGE: 1.1616.2144.204

  BitKeeper/deleted/.del-init_db.sql@stripped, 2006-11-10 17:04:50+01:00,
msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.4.1.2

  BitKeeper/deleted/.del-init_db.sql@stripped, 2006-11-10 17:04:50+01:00,
msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/lib/init_db.sql -> BitKeeper/deleted/.del-init_db.sql

  BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7@stripped, 2006-11-10 17:04:50+01:00,
msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.2.1.1

  BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7@stripped, 2006-11-10 17:04:50+01:00,
msvensson@neptunus.(none) +0 -0
    Merge rename: mysql-test/init_db.sql ->
BitKeeper/deleted/.del-init_db.sql~af2dfeabaa348dd7

  mysql-test/Makefile.am@stripped, 2006-11-10 17:04:50+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.39.1.17

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug20166/my50-bug20166/RESYNC

--- 1.73/mysql-test/Makefile.am	2006-11-10 17:04:58 +01:00
+++ 1.74/mysql-test/Makefile.am	2006-11-10 17:04:58 +01:00
@@ -34,7 +34,7 @@ benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test
 EXTRA_SCRIPTS = 	mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
 EXTRA_DIST = 		$(EXTRA_SCRIPTS) 
-GENSCRIPTS =		mysql-test-run install_test_db mtr
+GENSCRIPTS =		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 std_data/client-cert.pem std_data/cacert.pem \
@@ -116,6 +116,11 @@ std_data/server-key.pem: $(top_srcdir)/S
 mtr:
 	$(RM) -f mtr
 	$(LN_S) mysql-test-run.pl mtr
+
+# 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