Skip to content

Commit 75b9db9

Browse files
author
He Zhenxing
committed
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.
1 parent f09129c commit 75b9db9

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

mysql-test/mysql-test-run.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,8 +1828,8 @@ sub environment_setup {
18281828
}
18291829
else
18301830
{
1831-
$semisync_master_filename = "libsemisync_master.so";
1832-
$semisync_slave_filename = "libsemisync_slave.so";
1831+
$semisync_master_filename = "semisync_master.so";
1832+
$semisync_slave_filename = "semisync_slave.so";
18331833
}
18341834
my $lib_semisync_master_plugin=
18351835
mtr_file_exists(vs_config_dirs('plugin/semisync',$semisync_master_filename),

plugin/semisync/Makefile.am

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ INCLUDES = -I$(top_srcdir)/include \
2323

2424
noinst_HEADERS = semisync.h semisync_master.h semisync_slave.h
2525

26-
pkgplugin_LTLIBRARIES = libsemisync_master.la libsemisync_slave.la
26+
pkgplugin_LTLIBRARIES = semisync_master.la semisync_slave.la
2727

28-
libsemisync_master_la_LDFLAGS = -module
29-
libsemisync_master_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
30-
libsemisync_master_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
31-
libsemisync_master_la_SOURCES = semisync.cc semisync_master.cc semisync_master_plugin.cc
28+
semisync_master_la_LDFLAGS = -module
29+
semisync_master_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
30+
semisync_master_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
31+
semisync_master_la_SOURCES = semisync.cc semisync_master.cc semisync_master_plugin.cc
3232

33-
libsemisync_slave_la_LDFLAGS = -module
34-
libsemisync_slave_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
35-
libsemisync_slave_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
36-
libsemisync_slave_la_SOURCES = semisync.cc semisync_slave.cc semisync_slave_plugin.cc
33+
semisync_slave_la_LDFLAGS = -module
34+
semisync_slave_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
35+
semisync_slave_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
36+
semisync_slave_la_SOURCES = semisync.cc semisync_slave.cc semisync_slave_plugin.cc
3737

3838
EXTRA_DIST= CMakeLists.txt plug.in

plugin/semisync/plug.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
MYSQL_PLUGIN(semisync,[Semi-synchronous Replication Plugin],
22
[Semi-synchronous replication plugin.])
3-
MYSQL_PLUGIN_DYNAMIC(semisync, [libsemisync_master.la libsemisync_slave.la])
3+
MYSQL_PLUGIN_DYNAMIC(semisync, [semisync_master.la semisync_slave.la])

0 commit comments

Comments
 (0)