MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:September 8 2009 1:35pm
Subject:bzr commit into mysql-5.4 branch (joerg:2875) Bug#47007
View as plain text  
#At file:///MySQL/REPO/V54/clone-5.4/ based on revid:guilhem@stripped

 2875 Joerg Bruehe	2009-09-08
      This is the 5.4 version of the fix for bug#47007
         Unresolved reference to 'innodb_system_libs' in "mysql_config"
      
      In 5.4.2, we use InnoDB 1.0.4 which does file IO via separate
      threads, opposed to the use of asynchronous IO previously.
      
      So there is no InnoDB call to "aio_read()" which was searched
      in "librt", causing a "-lrt" value of "innodb_system_libs",
      that whole variable is gone.
      
      This fix was applied in the build of 5.4.2-beta.
     @ scripts/Makefile.am
        There is no "innodb_system_libs" variable any more,
        so it cannot be replaced by its value.
     @ scripts/mysql_config.pl.in
        InnoDB does not need any platform-specific libraries any more,
        "innodb_system_libs" may go.
     @ scripts/mysql_config.sh
        InnoDB does not need any platform-specific libraries any more,
        "innodb_system_libs" may go.

    modified:
      scripts/Makefile.am
      scripts/mysql_config.pl.in
      scripts/mysql_config.sh
=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am	2008-12-20 10:53:27 +0000
+++ b/scripts/Makefile.am	2009-09-08 13:35:01 +0000
@@ -169,7 +169,6 @@ SUFFIXES = .sh
 	  -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
 	  -e 's!@''LIBS''@!@LIBS@!' \
 	  -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
-	  -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
 	  -e 's!@''openssl_libs''@!@openssl_libs@!' \
 	  -e 's!@''VERSION''@!@VERSION@!' \
 	  -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \

=== modified file 'scripts/mysql_config.pl.in'
--- a/scripts/mysql_config.pl.in	2008-11-10 21:12:15 +0000
+++ b/scripts/mysql_config.pl.in	2009-09-08 13:35:01 +0000
@@ -202,7 +202,7 @@ $flags->{libs} =
 $flags->{libs_r} =
   [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@'];
 $flags->{embedded_libs} =
-  [@ldflags,@lib_e_opts,'@LIBDL@','@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@'];
+  [@ldflags,@lib_e_opts,'@LIBDL@','@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@openssl_libs@'];
 
 $flags->{include} = ["-I$pkgincludedir"];
 $flags->{cflags}  = [@{$flags->{include}},split(" ",'@CFLAGS@')];

=== modified file 'scripts/mysql_config.sh'
--- a/scripts/mysql_config.sh	2008-11-10 21:12:15 +0000
+++ b/scripts/mysql_config.sh	2009-09-08 13:35:01 +0000
@@ -107,7 +107,7 @@ fi
 libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
+embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 
 if [ -r "$pkglibdir/libmygcc.a" ]; then
   # When linking against the static library with a different version of GCC


Attachment: [text/bzr-bundle] bzr/joerg@mysql.com-20090908133501-alblt2pshwg57aae.bundle
Thread
bzr commit into mysql-5.4 branch (joerg:2875) Bug#47007Joerg Bruehe8 Sep