Hi,
Could you please review this patch! Thank you!
He Zhenxing wrote:
> #At file:///media/sdb2/hezx/work/mysql/bzrwork/semisync/5.1-rep-semisync/ based on
> revid:zhenxing.he@stripped
>
> 3124 He Zhenxing 2009-11-20
> 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.
> @ mysql-test/mysql-test-run.pl
> Remove 'lib' prefix for semisync plugin library names
> @ plugin/semisync/Makefile.am
> Remove 'lib' prefix for semisync plugin library names
> @ plugin/semisync/plug.in
> Remove 'lib' prefix for semisync plugin library names
>
> M mysql-test/mysql-test-run.pl
> M plugin/semisync/Makefile.am
> M plugin/semisync/plug.in
> === modified file 'mysql-test/mysql-test-run.pl'
> --- a/mysql-test/mysql-test-run.pl 2009-10-23 04:56:30 +0000
> +++ b/mysql-test/mysql-test-run.pl 2009-11-20 04:01:09 +0000
> @@ -1828,8 +1828,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-10-23 04:56:30 +0000
> +++ b/plugin/semisync/Makefile.am 2009-11-20 04:01:09 +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
> -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
> +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
> -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
> +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-20 04:01:09 +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])
>
