bk commit into 5.1 tree (joerg:1.2546)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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-06-13 14:23:09+02:00, joerg@trift2. +8 -0
  Merge trift2.:/MySQL/M50/merge-5.0
  into  trift2.:/MySQL/M51/merge-5.1
  MERGE: 1.1810.2943.37

  configure.in@stripped, 2007-06-13 14:09:26+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.245.86.4

  libmysqld/lib_sql.cc@stripped, 2007-06-13 14:21:13+02:00, joerg@trift2. +0 -1
    "real_id" is not needed in 5.1, so the change need not propagate.
    MERGE: 1.107.1.22

  netware/myisam_ftdump.def@stripped, 2007-06-13 14:09:26+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.4.1.1

  netware/myisamchk.def@stripped, 2007-06-13 14:09:26+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.8.1.1

  netware/myisamlog.def@stripped, 2007-06-13 14:09:26+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.8.1.1

  netware/myisampack.def@stripped, 2007-06-13 14:09:26+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.8.1.1

  sql/Makefile.am@stripped, 2007-06-13 14:09:26+02:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.103.1.31

  sql/item_func.cc@stripped, 2007-06-13 14:22:54+02:00, joerg@trift2. +0 -1
    "real_id" is not needed in 5.1, so the change need not propagate.
    MERGE: 1.270.1.78

# 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:	trift2.
# Root:	/MySQL/M51/merge-5.1/RESYNC

--- 1.467/configure.in	2007-05-24 17:35:06 +02:00
+++ 1.468/configure.in	2007-06-13 14:09:26 +02:00
@@ -1667,6 +1667,12 @@
     [CLIENT_EXTRA_LDFLAGS=])
 AC_SUBST(CLIENT_EXTRA_LDFLAGS)
 
+AC_ARG_WITH(mysqld-libs,
+    [  --with-mysqld-libs   Extra libraries to link with for mysqld],
+    [MYSQLD_EXTRA_LIBS=$withval],
+    [MYSQLD_EXTRA_LIBS=])
+AC_SUBST(MYSQLD_EXTRA_LIBS)
+
 AC_ARG_WITH(lib-ccflags,
     [  --with-lib-ccflags      Extra CC options for libraries],
     [LIB_EXTRA_CCFLAGS=$withval],

--- 1.185/sql/Makefile.am	2007-05-07 15:46:26 +02:00
+++ 1.186/sql/Makefile.am	2007-06-13 14:09:26 +02:00
@@ -38,7 +38,7 @@
 			@pstack_libs@ \
 			@mysql_plugin_libs@ \
 			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
-                        $(yassl_libs) $(openssl_libs)
+                        $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
 
 noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			item_strfunc.h item_timefunc.h \