bk commit into 5.1 tree (msvensson:1.2345)

[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-20 09:36:16+02:00, msvensson@shellback.(none) +3 -0
  Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.2309.1.16

  extra/Makefile.am@stripped, 2006-09-20 09:36:11+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.37.1.3

  sql/Makefile.am@stripped, 2006-09-20 09:36:12+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.145.3.2

  support-files/mysql.spec.sh@stripped, 2006-09-20 09:36:12+02:00, msvensson@shellback.(none)
+0 -0
    Auto merged
    MERGE: 1.163.1.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/mysql-5.1-maint/RESYNC

--- 1.40/extra/Makefile.am	2006-09-20 09:36:24 +02:00
+++ 1.41/extra/Makefile.am	2006-09-20 09:36:24 +02:00
@@ -41,9 +41,10 @@
 $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
 $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
 
-bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \
+bin_PROGRAMS =		replace perror resolveip my_print_defaults \
 			resolve_stack_dump mysql_waitpid innochecksum
 noinst_PROGRAMS =	charset2html
+EXTRA_PROGRAMS =	comp_err
 EXTRA_DIST =		CMakeLists.txt
 
 perror.o: perror.c 

--- 1.156/sql/Makefile.am	2006-09-20 09:36:24 +02:00
+++ 1.157/sql/Makefile.am	2006-09-20 09:36:24 +02:00
@@ -27,7 +27,7 @@
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
-noinst_PROGRAMS =	gen_lex_hash
+EXTRA_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			$(top_builddir)/vio/libvio.a \

--- 1.164/support-files/mysql.spec.sh	2006-09-20 09:36:24 +02:00
+++ 1.165/support-files/mysql.spec.sh	2006-09-20 09:36:24 +02:00
@@ -640,7 +640,6 @@
 %defattr(-, root, root, 0755)
 %doc mysql-release-%{mysql_version}/EXCEPTIONS-CLIENT
 %doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
-%attr(755, root, root) %{_bindir}/comp_err
 %attr(755, root, root) %{_bindir}/mysql_config
 %dir %attr(755, root, root) %{_includedir}/mysql
 %dir %attr(755, root, root) %{_libdir}/mysql