From: 'Hartmut Holzgraefe'
Date: December 19 2005 7:33am
Subject: bk commit into 5.1 tree (hartmut:1.1964)
List-Archive: http://lists.mysql.com/commits/236
Message-Id: <20051219073341.BA0D01B2A10@linux.site>

Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut 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
  1.1964 05/12/19 08:33:27 hartmut@stripped +1 -0
  Merge hholzgraefe@stripped:/home/bk/mysql-5.1-new
  into  mysql.com:/home/hartmut/projects/mysql/dev/5.1

  extra/Makefile.am
    1.34 05/12/19 08:33:15 hartmut@stripped +0 -0
    Auto merged

# 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:	hartmut
# Host:	linux.site
# Root:	/home/hartmut/projects/mysql/dev/5.1/RESYNC

--- 1.33/extra/Makefile.am	2005-12-05 14:17:39 +01:00
+++ 1.34/extra/Makefile.am	2005-12-19 08:33:15 +01:00
@@ -29,8 +29,8 @@
 DIST_SUBDIRS=           yassl
 
 # This will build mysqld_error.h and sql_state.h
-$(top_builddir)/include/mysqld_error.h: comp_err
-	$(top_builddir)/extra/comp_err \
+$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
+	$(top_builddir)/extra/comp_err$(EXEEXT) \
 	--charset=$(top_srcdir)/sql/share/charsets \
 	--out-dir=$(top_builddir)/sql/share/ \
 	--header_file=$(top_builddir)/include/mysqld_error.h \