bk commit into 5.1 tree (kent:1.2151)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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.2151 06/03/06 13:50:52 kent@stripped +5 -0
  Merge

  support-files/mysql.spec.sh
    1.130 06/03/06 13:50:36 kent@stripped +22 -27
    Embedded is to be enabled in 5.1

  server-tools/instance-manager/Makefile.am
    1.32 06/03/06 13:46:04 kent@stripped +0 -1

  sql/field_conv.cc
    1.55 06/03/06 13:43:08 kent@stripped +0 -17
    Auto merged

  mysql-test/t/binary.test
    1.17 06/03/06 13:43:07 kent@stripped +0 -12
    Auto merged

  mysql-test/r/binary.result
    1.22 06/03/06 13:43:07 kent@stripped +0 -19
    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:	kent
# Host:	c-4c4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new/RESYNC

--- 1.129/support-files/mysql.spec.sh	2006-02-21 20:47:09 +01:00
+++ 1.130/support-files/mysql.spec.sh	2006-03-06 13:50:36 +01:00
@@ -425,8 +425,7 @@
 install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
 
 # Install embedded server library in the build root
-# FIXME No libmysqld on 5.0 yet
-#install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
+install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
 
 # Create a symlink "rcmysql", pointing to the init.script. SuSE users
 # will appreciate that, as all services usually offer this.
@@ -703,7 +702,7 @@
 
 %files embedded
 %defattr(-, root, root, 0755)
-# %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
 
 # The spec file changelog only includes changes made to the spec file
 # itself - note that they must be ordered by date (important when

--- 1.31/server-tools/instance-manager/Makefile.am	2006-02-12 20:33:11 +01:00
+++ 1.32/server-tools/instance-manager/Makefile.am	2006-03-06 13:46:04 +01:00
@@ -24,9 +24,10 @@
 # default_options.h, generated from default_options.h.in)
 # See automake/autoconf docs for details
 
-noinst_LIBRARIES= liboptions.a libnet.a
+noinst_LTLIBRARIES= liboptions.la
+noinst_LIBRARIES=   libnet.a
 
-liboptions_a_CXXFLAGS= $(CXXFLAGS) \
+liboptions_la_CXXFLAGS= $(CXXFLAGS) \
 	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
 	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \
 	-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \
@@ -35,8 +36,8 @@
 	-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \
 	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
 
-liboptions_a_SOURCES= options.h options.cc priv.h priv.cc
-liboptions_a_LIBADD= $(top_builddir)/libmysql/get_password.$(OBJEXT)
+liboptions_la_SOURCES= options.h options.cc priv.h priv.cc
+liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo
 
 # MySQL sometimes uses symlinks to reuse code 
 # All symlinked files are grouped in libnet.a