bk commit into 5.1 tree (joerg:1.2507)

[joerg]

Below is the list of changes that have just been committed into a local
5.1 repository of mysqldev. When mysqldev 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-05-02 12:49:10+02:00, joerg@stripped +3 -0
  Local fix: Makefile rules need leading tab

  client/Makefile.am@stripped, 2007-05-02 12:46:28+02:00, joerg@stripped +7 -7
    Local fix: Makefile rules need leading tab

  netware/Makefile.am@stripped, 2007-05-02 12:41:31+02:00, joerg@stripped +3 -3
    Local fix: Makefile rules need leading tab

  scripts/Makefile.am@stripped, 2007-05-02 12:44:24+02:00, joerg@stripped +1 -1
    Local fix: Makefile rules need leading tab

# 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:	joerg
# Host:	suse9-x86.mysql.com
# Root:	/data0/mydev/mysql-5.1.18-beta-build

--- 1.91/client/Makefile.am	2007-05-02 12:49:36 +02:00
+++ 1.92/client/Makefile.am	2007-05-02 12:49:36 +02:00
@@ -109,13 +109,13 @@
 	for f in $(sql_src) ; do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
-         done; \
-        for f in $(strings_src) ; do \
-          rm -f $(srcdir)/$$f; \
-          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
-         done; \
-         rm -f $(srcdir)/my_user.c; \
-         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
+	done; \
+	for f in $(strings_src) ; do \
+	  rm -f $(srcdir)/$$f; \
+	  @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
+	 done; \
+	 rm -f $(srcdir)/my_user.c; \
+	 @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
 	echo timestamp > link_sources;
 
 # Don't update the files from bitkeeper

--- 1.67/scripts/Makefile.am	2007-05-02 12:49:36 +02:00
+++ 1.68/scripts/Makefile.am	2007-05-02 12:49:36 +02:00
@@ -113,7 +113,7 @@
 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 \
+	  mysql_fix_privilege_tables \
 	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
 
 

--- 1.27/netware/Makefile.am	2007-05-02 12:49:36 +02:00
+++ 1.28/netware/Makefile.am	2007-05-02 12:49:36 +02:00
@@ -98,20 +98,20 @@
 # Build init_db.sql from the files that contain
 # the system tables for this version of MySQL plus any commands
 init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
-             $(top_srcdir)/scripts/mysql_system_tables_data.sql
+	     $(top_srcdir)/scripts/mysql_system_tables_data.sql
 	@echo "Building $@";
 	@echo "CREATE DATABASE mysql;" > $@;
 	@echo "CREATE DATABASE test;" >> $@;
 	@echo "use mysql;" >> $@;
 	@cat $(top_srcdir)/scripts/mysql_system_tables.sql \
-             $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
+	     $(top_srcdir)/scripts/mysql_system_tables_fix.sql >> $@;
 
 # Build test_db.sql from init_db.sql plus
 # some test data
 test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
 	@echo "Building $@";
 	@cat init_db.sql \
-             $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
+	     $(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@;
 
 endif