bk commit into 5.1 tree (msvensson:1.2322)

[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, 2006-09-18 21:15:38+02:00, msvensson@shellback.(none) +2 -0
  Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
  into  shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
  MERGE: 1.1810.2066.3

  extra/Makefile.am@stripped, 2006-09-18 21:15:34+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.30.1.3

  sql/Makefile.am@stripped, 2006-09-18 21:15:34+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.103.3.1

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/bug19738/my51-bug19738/RESYNC

--- 1.37/extra/Makefile.am	2006-09-18 21:15:44 +02:00
+++ 1.38/extra/Makefile.am	2006-09-18 21:15:44 +02:00
@@ -22,11 +22,16 @@
                         $(top_builddir)/include/sql_state.h \
                         $(top_builddir)/include/mysqld_ername.h
 pkginclude_HEADERS=	$(BUILT_SOURCES)
-CLEANFILES =		$(BUILT_SOURCES)
+DISTCLEANFILES =	$(BUILT_SOURCES)
 SUBDIRS =		@yassl_dir@
 
-# This will build mysqld_error.h and sql_state.h
-$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
+# This will build mysqld_error.h, mysqld_ername.h and sql_state.h
+# NOTE Built files should depend on their sources to avoid
+# the built files being rebuilt in source dist
+$(top_builddir)/include/mysqld_error.h: comp_err.c \
+			$(top_srcdir)/sql/share/errmsg.txt \
+			$(wildcard $(top_srcdir)/sql/share/charsets/*.xml)
+	$(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT)
 	$(top_builddir)/extra/comp_err$(EXEEXT) \
 	--charset=$(top_srcdir)/sql/share/charsets \
 	--out-dir=$(top_builddir)/sql/share/ \

--- 1.155/sql/Makefile.am	2006-09-18 21:15:44 +02:00
+++ 1.156/sql/Makefile.am	2006-09-18 21:15:44 +02:00
@@ -154,7 +154,11 @@
 		@echo "If it fails, re-run configure with --with-low-memory"
 		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
 
-lex_hash.h:	gen_lex_hash$(EXEEXT)
+# This generates lex_hash.h
+# NOTE Built sources should depend on their sources not the tool
+# this avoid the rebuild of the built files in a source dist
+lex_hash.h:	gen_lex_hash.cc lex.h
+		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
 		./gen_lex_hash$(EXEEXT) > $@
 
 # the following three should eventually be moved out of this directory