diff -Naur mysql-cluster-gpl-7.0.12/plugin/daemon_example/Makefile.am mysql-cluster-gpl-7.0.12.oden/plugin/daemon_example/Makefile.am --- mysql-cluster-gpl-7.0.12/plugin/daemon_example/Makefile.am 2010-01-29 19:05:46.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/plugin/daemon_example/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -27,7 +27,7 @@ EXTRA_LTLIBRARIES = libdaemon_example.la pkgplugin_LTLIBRARIES = @plugin_daemon_example_shared_target@ -libdaemon_example_la_LDFLAGS = -module -rpath $(pkgplugindir) +libdaemon_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) libdaemon_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN libdaemon_example_la_SOURCES = daemon_example.cc diff -Naur mysql-cluster-gpl-7.0.12/plugin/fulltext/Makefile.am mysql-cluster-gpl-7.0.12.oden/plugin/fulltext/Makefile.am --- mysql-cluster-gpl-7.0.12/plugin/fulltext/Makefile.am 2010-01-29 19:05:46.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/plugin/fulltext/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -21,7 +21,7 @@ #noinst_LTLIBRARIES= mypluglib.la pkgplugin_LTLIBRARIES= mypluglib.la mypluglib_la_SOURCES= plugin_example.c -mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir) +mypluglib_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN # Don't update the files from bitkeeper diff -Naur mysql-cluster-gpl-7.0.12/storage/archive/Makefile.am mysql-cluster-gpl-7.0.12.oden/storage/archive/Makefile.am --- mysql-cluster-gpl-7.0.12/storage/archive/Makefile.am 2010-01-29 19:06:24.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/storage/archive/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -36,7 +36,7 @@ EXTRA_LTLIBRARIES = ha_archive.la pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ -ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_SOURCES = ha_archive.cc azio.c diff -Naur mysql-cluster-gpl-7.0.12/storage/blackhole/Makefile.am mysql-cluster-gpl-7.0.12.oden/storage/blackhole/Makefile.am --- mysql-cluster-gpl-7.0.12/storage/blackhole/Makefile.am 2010-01-29 19:06:24.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/storage/blackhole/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -35,7 +35,7 @@ EXTRA_LTLIBRARIES = ha_blackhole.la pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ -ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) +ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_blackhole_la_SOURCES=ha_blackhole.cc diff -Naur mysql-cluster-gpl-7.0.12/storage/csv/Makefile.am mysql-cluster-gpl-7.0.12.oden/storage/csv/Makefile.am --- mysql-cluster-gpl-7.0.12/storage/csv/Makefile.am 2010-01-29 19:06:24.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/storage/csv/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -32,7 +32,7 @@ EXTRA_LTLIBRARIES = ha_csv.la pkglib_LTLIBRARIES = @plugin_csv_shared_target@ -ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +ha_csv_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) ha_csv_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc diff -Naur mysql-cluster-gpl-7.0.12/storage/example/Makefile.am mysql-cluster-gpl-7.0.12.oden/storage/example/Makefile.am --- mysql-cluster-gpl-7.0.12/storage/example/Makefile.am 2010-01-29 19:06:24.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/storage/example/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -35,7 +35,7 @@ EXTRA_LTLIBRARIES = ha_example.la pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ -ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_example_la_SOURCES = ha_example.cc diff -Naur mysql-cluster-gpl-7.0.12/storage/federated/Makefile.am mysql-cluster-gpl-7.0.12.oden/storage/federated/Makefile.am --- mysql-cluster-gpl-7.0.12/storage/federated/Makefile.am 2010-01-29 19:06:24.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/storage/federated/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -35,7 +35,7 @@ EXTRA_LTLIBRARIES = ha_federated.la pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ -ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) +ha_federated_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) ha_federated_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federated_la_SOURCES = ha_federated.cc diff -Naur mysql-cluster-gpl-7.0.12/storage/ibmdb2i/Makefile.am mysql-cluster-gpl-7.0.12.oden/storage/ibmdb2i/Makefile.am --- mysql-cluster-gpl-7.0.12/storage/ibmdb2i/Makefile.am 2010-01-29 19:06:24.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/storage/ibmdb2i/Makefile.am 2010-02-09 19:02:07.000000000 +0100 @@ -33,7 +33,7 @@ EXTRA_LTLIBRARIES = ha_ibmdb2i.la pkgplugin_LTLIBRARIES = @plugin_ibmdb2i_shared_target@ ha_ibmdb2i_la_LIBADD = -liconv -ha_ibmdb2i_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) +ha_ibmdb2i_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) ha_ibmdb2i_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_ibmdb2i_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_ibmdb2i_la_SOURCES = ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc \ diff -Naur mysql-cluster-gpl-7.0.12/storage/innobase/Makefile.am mysql-cluster-gpl-7.0.12.oden/storage/innobase/Makefile.am --- mysql-cluster-gpl-7.0.12/storage/innobase/Makefile.am 2010-01-29 19:06:24.000000000 +0100 +++ mysql-cluster-gpl-7.0.12.oden/storage/innobase/Makefile.am 2010-02-09 19:03:19.000000000 +0100 @@ -163,7 +163,7 @@ EXTRA_LTLIBRARIES= ha_innodb.la pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@ -ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir) +ha_innodb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES)