bzr commit into mysql-5.5-trunk-bugfixing branch (zhenxing.he:2912) Bug#49020

[He Zhenxing]

#At file:///media/sdb2/hezx/work/mysql/bzrwork/semisync/b49020/trunk-bugfixing/ based on revid:zhenxing.he@stripped

 2912 He Zhenxing	2009-12-04
      Postfix after merge patch for Bug#49020
     @ plugin/semisync/CMakeLists.txt
        Add mysqlservices to link libraries
     @ plugin/semisync/Makefile.am
        Add mysqlservices to link libraries

    M  plugin/semisync/CMakeLists.txt
    M  plugin/semisync/Makefile.am
=== modified file 'plugin/semisync/CMakeLists.txt'
--- a/plugin/semisync/CMakeLists.txt	2009-10-23 07:22:20 +0000
+++ b/plugin/semisync/CMakeLists.txt	2009-12-04 09:54:11 +0000
@@ -29,7 +29,7 @@ SET(SEMISYNC_SLAVE_SOURCES semisync.cc s
 
 ADD_DEFINITIONS(-DMYSQL_DYNAMIC_PLUGIN)
 ADD_LIBRARY(semisync_master SHARED ${SEMISYNC_MASTER_SOURCES})
-TARGET_LINK_LIBRARIES(semisync_master  mysqld)
+TARGET_LINK_LIBRARIES(semisync_master  mysqlservices mysqld)
 ADD_LIBRARY(semisync_slave SHARED ${SEMISYNC_SLAVE_SOURCES})
 TARGET_LINK_LIBRARIES(semisync_slave  mysqld)
 MESSAGE("build SEMISYNC as DLL")

=== modified file 'plugin/semisync/Makefile.am'
--- a/plugin/semisync/Makefile.am	2009-10-23 04:56:30 +0000
+++ b/plugin/semisync/Makefile.am	2009-12-04 09:54:11 +0000
@@ -25,12 +25,12 @@ noinst_HEADERS = semisync.h semisync_mas
 
 pkgplugin_LTLIBRARIES =	libsemisync_master.la libsemisync_slave.la
 
-libsemisync_master_la_LDFLAGS =	-module
+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
 
-libsemisync_slave_la_LDFLAGS =	-module
+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


Attachment: [text/bzr-bundle] bzr/[e-mail]