From: Tor Didriksen
Date: November 17 2011 2:52pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:3622 to 3623) WL#5825
List-Archive: http://lists.mysql.com/commits/142017
Message-Id: <201111171452.pAHEql7W029622@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3623 Tor Didriksen	2011-11-17
      WL#5825 Using C++ Standard Library with MySQL code
      post-push cleanup:
      the old workaround to avoid
        undefined reference to `__pure_virtual'
      no longer works.
      The client library contains C++ code, and must be linked with g++

    modified:
      scripts/mysql_config.sh
      support-files/mysql.spec.sh
 3622 Jimmy Yang	2011-11-17
      Fix some unused-but-set-variable warnings in FTS code.

    modified:
      storage/innobase/fts/fts0fts.c
      storage/innobase/fts/fts0opt.c
      storage/innobase/fts/fts0que.c
      storage/innobase/include/rem0cmp.ic
      storage/innobase/row/row0ftsort.c
      storage/innobase/row/row0merge.c
      storage/innobase/row/row0upd.c
=== modified file 'scripts/mysql_config.sh'
--- a/scripts/mysql_config.sh	2011-11-08 14:33:41 +0000
+++ b/scripts/mysql_config.sh	2011-11-17 14:51:28 +0000
@@ -116,16 +116,6 @@ libs_r=" $ldflags -L$pkglibdir -lmysqlcl
 embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 embedded_libs="$embedded_libs @QUOTED_CMAKE_CXX_LINK_FLAGS@"
 
-if [ -r "$pkglibdir/libmygcc.a" ]; then
-  # When linking against the static library with a different version of GCC
-  # from what was used to compile the library, some symbols may not be defined
-  # automatically.  We package the libmygcc.a from the build host, to provide
-  # definitions for those.  Bugs 4921, 19561, 19817, 21158, etc.
-  libs="$libs -lmygcc "
-  libs_r="$libs_r -lmygcc "
-  embedded_libs="$embedded_libs -lmygcc "
-fi
-
 cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
 cxxflags="-I$pkgincludedir @CXXFLAGS@ " #note: end space!
 include="-I$pkgincludedir"

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2011-10-28 12:45:35 +0000
+++ b/support-files/mysql.spec.sh	2011-11-17 14:51:28 +0000
@@ -487,23 +487,6 @@ install -d $RBR%{_sbindir}
   make DESTDIR=$RBR install
 )
 
-# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  Do
-# this in a sub-shell to ensure we don't pollute the install environment
-# with compiler bits.
-(
-  PATH=${MYSQL_BUILD_PATH:-$PATH}
-  CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-  CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-  if "${CC}" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1; then
-    libgcc=`${CC} ${CFLAGS} --print-libgcc-file`
-    if [ -f ${libgcc} ]; then
-      mkdir -p $RBR%{_libdir}/mysql
-      install -m 644 ${libgcc} $RBR%{_libdir}/mysql/libmygcc.a
-      echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
-    fi
-  fi
-)
-
 # FIXME: at some point we should stop doing this and just install everything
 # FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming
 # FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax

No bundle (reason: useless for push emails).