MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:December 15 2009 8:40pm
Subject:bzr commit into mysql-5.5-trunk-bugfixing branch (alik:2918) Bug#48351
View as plain text  
#At file:///mnt/raid/alik/MySQL/bzr/backporting/mysql-trunk-bugfixing/ based on revid:alik@stripped

 2918 Alexander Nozdrin	2009-12-15 [merge]
      Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin)
      from mysql-next-mr-bugfixing to mysql-trunk-bugfixing.
      
      Original revision:
      ------------------------------------------------------------
      revision-id: zhenxing.he@stripped
      committer: He Zhenxing <zhenxing.he@stripped>
      branch nick: 5.1-rep-semisync
      timestamp: Fri 2009-11-27 16:49:45 +0800
      message:
        Bug#48351 Inconsistent library names for semisync plugin
        
        The semisync plugin library names on Unix like systems were prefixed with
        'lib', which did not follow the conventions.
        
        Fix the problem by removing the 'lib' prefix on Unix systems.
      ------------------------------------------------------------

    modified:
      mysql-test/mysql-test-run.pl
      plugin/semisync/Makefile.am
      plugin/semisync/plug.in
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2009-12-15 20:23:01 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-12-15 20:40:20 +0000
@@ -1843,8 +1843,8 @@ sub environment_setup {
     }
     else
     {
-       $semisync_master_filename = "libsemisync_master.so";
-       $semisync_slave_filename = "libsemisync_slave.so";
+       $semisync_master_filename = "semisync_master.so";
+       $semisync_slave_filename = "semisync_slave.so";
     }
     my $lib_semisync_master_plugin=
       mtr_file_exists(vs_config_dirs('plugin/semisync',$semisync_master_filename),

=== modified file 'plugin/semisync/Makefile.am'
--- a/plugin/semisync/Makefile.am	2009-12-04 09:54:11 +0000
+++ b/plugin/semisync/Makefile.am	2009-12-15 20:40:20 +0000
@@ -23,16 +23,16 @@ INCLUDES =              -I$(top_srcdir)/
 
 noinst_HEADERS = semisync.h semisync_master.h semisync_slave.h
 
-pkgplugin_LTLIBRARIES =	libsemisync_master.la libsemisync_slave.la
+pkgplugin_LTLIBRARIES =	semisync_master.la semisync_slave.la
 
-libsemisync_master_la_LDFLAGS =	-module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
-libsemisync_master_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_master_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_master_la_SOURCES = semisync.cc semisync_master.cc semisync_master_plugin.cc
+semisync_master_la_LDFLAGS =	-module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+semisync_master_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_master_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_master_la_SOURCES =	semisync.cc semisync_master.cc semisync_master_plugin.cc
 
-libsemisync_slave_la_LDFLAGS =	-module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
-libsemisync_slave_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_slave_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libsemisync_slave_la_SOURCES = semisync.cc semisync_slave.cc semisync_slave_plugin.cc
+semisync_slave_la_LDFLAGS =	-module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices
+semisync_slave_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_slave_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+semisync_slave_la_SOURCES =	semisync.cc semisync_slave.cc semisync_slave_plugin.cc
 
 EXTRA_DIST=		CMakeLists.txt plug.in

=== modified file 'plugin/semisync/plug.in'
--- a/plugin/semisync/plug.in	2009-09-26 04:49:49 +0000
+++ b/plugin/semisync/plug.in	2009-11-27 08:49:45 +0000
@@ -1,3 +1,3 @@
 MYSQL_PLUGIN(semisync,[Semi-synchronous Replication Plugin],
         [Semi-synchronous replication plugin.])
-MYSQL_PLUGIN_DYNAMIC(semisync,   [libsemisync_master.la libsemisync_slave.la])
+MYSQL_PLUGIN_DYNAMIC(semisync,   [semisync_master.la semisync_slave.la])


Attachment: [text/bzr-bundle] bzr/alik@sun.com-20091215204020-88heddplmusfooub.bundle
Thread
bzr commit into mysql-5.5-trunk-bugfixing branch (alik:2918) Bug#48351Alexander Nozdrin15 Dec