bk commit into 5.1 tree (msvensson:1.2609)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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-04-23 14:02:09+02:00, msvensson@stripped +1 -0
  Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
  into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2843.7

  scripts/Makefile.am@stripped, 2007-04-23 14:02:07+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.43.1.18

# 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.1-maint/RESYNC

--- 1.66/scripts/Makefile.am	2007-04-18 19:34:48 +02:00
+++ 1.67/scripts/Makefile.am	2007-04-23 14:02:07 +02:00
@@ -15,6 +15,11 @@
 
 ## Process this file with automake to create Makefile.in
 
+BUILT_SOURCES = mysql_fix_privilege_tables.sql \
+                mysql_fix_privilege_tables_sql.c
+
+noinst_PROGRAMS = 	comp_sql
+
 bin_SCRIPTS =		@server_scripts@ \
 			msql2mysql \
 			mysql_config \
@@ -83,7 +88,8 @@ CLEANFILES =		@server_scripts@ \
 			mysqldumpslow \
 			mysql_tableinfo \
 			mysqld_multi \
-			mysql_fix_privilege_tables.sql
+			mysql_fix_privilege_tables.sql \
+			mysql_fix_privilege_tables_sql.c
 
 # mysqlbug should be distributed built so that people can report build
 # failures with it.
@@ -100,6 +106,17 @@ mysql_fix_privilege_tables.sql: mysql_sy
 	@echo "Building $@";
 	@cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@
 
+#
+# Build mysql_fix_privilege_tables_sql.c from
+# mysql_fix_privileges_tables.sql using comp_sql
+#
+mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
+	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
+	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
+          mysql_fix_privilege_tables \
+	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
+
+
 SUFFIXES = .sh
 
 .sh:
@@ -154,19 +171,6 @@ SUFFIXES = .sh
 	$< > $@-t
 	@CHMOD@ +x $@-t
 	@MV@ $@-t $@
-
-
-BUILT_SOURCES = 	mysql_fix_privilege_tables_sql.c
-noinst_PROGRAMS = 	comp_sql
-
-#
-# Build mysql_fix_privilege_tables_sql.c from
-# mysql_fix_privileges_tables.sql using comp_sql
-#
-mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
-	$(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT)
-	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
-          mysql_fix_privilege_tables.sql $@
 
 
 # Don't update the files from bitkeeper