MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:He Zhenxing Date:December 1 2009 3:19am
Subject:bzr commit into mysql-6.0-codebase-bugfixing branch (zhenxing.he:3740)
Bug#48351
View as plain text  
#At file:///media/sdb2/hezx/work/mysql/bzrwork/semisync/b48351/6.0-codebase-bugfixing/ based on revid:tor.didriksen@stripped

 3740 He Zhenxing	2009-12-01 [merge]
      Manual merge Bug#48351 from 5.1-rep-semisync to 6.0-codebase-bugfixing

    D  plugin/semisync/Makefile.am
    D  plugin/semisync/plug.in
    A  plugin/semisync/Makefile.am
    A  plugin/semisync/plug.in
    M  mysql-test/mysql-test-run.pl
    2497.1075.20 He Zhenxing	2009-11-27
                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-26 14:02:26 +0000
+++ b/mysql-test/mysql-test-run.pl	2009-12-01 03:16:52 +0000
@@ -1871,8 +1871,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),

=== added file 'plugin/semisync/Makefile.am'
--- a/plugin/semisync/Makefile.am	1970-01-01 00:00:00 +0000
+++ b/plugin/semisync/Makefile.am	2009-12-01 03:16:52 +0000
@@ -0,0 +1,38 @@
+# Copyright (C) 2006 MySQL AB
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+## Makefile.am for semi-synchronous replication
+
+pkgplugindir =		$(pkglibdir)/plugin
+INCLUDES =              -I$(top_srcdir)/include \
+			-I$(top_srcdir)/sql \
+			-I$(top_srcdir)/regex \
+			-I$(srcdir)
+
+noinst_HEADERS = semisync.h semisync_master.h semisync_slave.h
+
+pkgplugin_LTLIBRARIES =	semisync_master.la semisync_slave.la
+
+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
+
+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

=== removed file 'plugin/semisync/Makefile.am'
--- a/plugin/semisync/Makefile.am	2009-10-26 14:02:26 +0000
+++ b/plugin/semisync/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-# Copyright (C) 2006 MySQL AB
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-## Makefile.am for semi-synchronous replication
-
-pkgplugindir =		$(pkglibdir)/plugin
-INCLUDES =              -I$(top_srcdir)/include \
-			-I$(top_srcdir)/sql \
-			-I$(top_srcdir)/regex \
-			-I$(srcdir)
-
-noinst_HEADERS = semisync.h semisync_master.h semisync_slave.h
-
-pkgplugin_LTLIBRARIES =	libsemisync_master.la libsemisync_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
-
-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
-
-EXTRA_DIST=		CMakeLists.txt plug.in

=== added file 'plugin/semisync/plug.in'
--- a/plugin/semisync/plug.in	1970-01-01 00:00:00 +0000
+++ b/plugin/semisync/plug.in	2009-12-01 03:16:52 +0000
@@ -0,0 +1,3 @@
+MYSQL_PLUGIN(semisync,[Semi-synchronous Replication Plugin],
+        [Semi-synchronous replication plugin.])
+MYSQL_PLUGIN_DYNAMIC(semisync,   [semisync_master.la semisync_slave.la])

=== removed file 'plugin/semisync/plug.in'
--- a/plugin/semisync/plug.in	2009-06-15 13:30:20 +0000
+++ b/plugin/semisync/plug.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-MYSQL_PLUGIN(semisync,[Semi-synchronous Replication Plugin],
-        [Semi-synchronous replication plugin.])
-MYSQL_PLUGIN_DYNAMIC(semisync,   [libsemisync_master.la libsemisync_slave.la])


Attachment: [text/bzr-bundle] bzr/zhenxing.he@sun.com-20091201031652-fjbhrj0gvjk0an9w.bundle
Thread
bzr commit into mysql-6.0-codebase-bugfixing branch (zhenxing.he:3740)Bug#48351He Zhenxing1 Dec