diff -Naur mysql-5.1.44/pinba_engine-0.0.5/src/Makefile.am mysql-5.1.44.oden/pinba_engine-0.0.5/src/Makefile.am
--- mysql-5.1.44/pinba_engine-0.0.5/src/Makefile.am	2009-03-13 10:14:15.000000000 +0100
+++ mysql-5.1.44.oden/pinba_engine-0.0.5/src/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -9,4 +9,4 @@
 lib_LTLIBRARIES = libpinba_engine.la
 libpinba_engine_la_SOURCES = pinba-pb.cc ha_pinba.cc data.cc tags.cc pool.cc main.cc
 libpinba_engine_la_LIBADD = $(DEPS_LIBS)
-libpinba_engine_la_LDFLAGS =	-module
+libpinba_engine_la_LDFLAGS = -module -avoid-version
diff -Naur mysql-5.1.44/plugin/daemon_example/Makefile.am mysql-5.1.44.oden/plugin/daemon_example/Makefile.am
--- mysql-5.1.44/plugin/daemon_example/Makefile.am	2010-02-04 12:38:52.000000000 +0100
+++ mysql-5.1.44.oden/plugin/daemon_example/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -26,7 +26,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-5.1.44/plugin/fulltext/Makefile.am mysql-5.1.44.oden/plugin/fulltext/Makefile.am
--- mysql-5.1.44/plugin/fulltext/Makefile.am	2010-02-04 12:38:52.000000000 +0100
+++ mysql-5.1.44.oden/plugin/fulltext/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -20,7 +20,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-5.1.44/storage/archive/Makefile.am mysql-5.1.44.oden/storage/archive/Makefile.am
--- mysql-5.1.44/storage/archive/Makefile.am	2010-02-04 12:39:55.000000000 +0100
+++ mysql-5.1.44.oden/storage/archive/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -35,7 +35,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-5.1.44/storage/blackhole/Makefile.am mysql-5.1.44.oden/storage/blackhole/Makefile.am
--- mysql-5.1.44/storage/blackhole/Makefile.am	2010-02-04 12:39:55.000000000 +0100
+++ mysql-5.1.44.oden/storage/blackhole/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -34,7 +34,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-5.1.44/storage/csv/Makefile.am mysql-5.1.44.oden/storage/csv/Makefile.am
--- mysql-5.1.44/storage/csv/Makefile.am	2010-02-04 12:39:55.000000000 +0100
+++ mysql-5.1.44.oden/storage/csv/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -31,7 +31,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-5.1.44/storage/example/Makefile.am mysql-5.1.44.oden/storage/example/Makefile.am
--- mysql-5.1.44/storage/example/Makefile.am	2010-02-04 12:39:55.000000000 +0100
+++ mysql-5.1.44.oden/storage/example/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -34,7 +34,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-5.1.44/storage/federated/Makefile.am mysql-5.1.44.oden/storage/federated/Makefile.am
--- mysql-5.1.44/storage/federated/Makefile.am	2010-02-04 12:39:55.000000000 +0100
+++ mysql-5.1.44.oden/storage/federated/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -34,7 +34,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-5.1.44/storage/ibmdb2i/Makefile.am mysql-5.1.44.oden/storage/ibmdb2i/Makefile.am
--- mysql-5.1.44/storage/ibmdb2i/Makefile.am	2010-02-04 12:39:55.000000000 +0100
+++ mysql-5.1.44.oden/storage/ibmdb2i/Makefile.am	2010-02-21 10:15:17.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-5.1.44/storage/innobase/Makefile.am mysql-5.1.44.oden/storage/innobase/Makefile.am
--- mysql-5.1.44/storage/innobase/Makefile.am	2010-02-04 12:39:55.000000000 +0100
+++ mysql-5.1.44.oden/storage/innobase/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -162,7 +162,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)
diff -Naur mysql-5.1.44/storage/innodb_plugin/Makefile.am mysql-5.1.44.oden/storage/innodb_plugin/Makefile.am
--- mysql-5.1.44/storage/innodb_plugin/Makefile.am	2010-02-04 12:39:59.000000000 +0100
+++ mysql-5.1.44.oden/storage/innodb_plugin/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -329,7 +329,7 @@
 EXTRA_LTLIBRARIES=	ha_innodb_plugin.la
 pkgplugin_LTLIBRARIES=	@plugin_innodb_plugin_shared_target@
 
-ha_innodb_plugin_la_LDFLAGS=	-module -rpath $(pkgplugindir)
+ha_innodb_plugin_la_LDFLAGS=	-module -avoid-version -rpath $(pkgplugindir)
 ha_innodb_plugin_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_innodb_plugin_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
 ha_innodb_plugin_la_SOURCES=	$(libinnobase_a_SOURCES)
diff -Naur mysql-5.1.44/storage/revision/Makefile.am mysql-5.1.44.oden/storage/revision/Makefile.am
--- mysql-5.1.44/storage/revision/Makefile.am	2010-02-21 10:13:43.000000000 +0100
+++ mysql-5.1.44.oden/storage/revision/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -20,7 +20,7 @@
 
 EXTRA_LTLIBRARIES = ha_revision.la
 pkglib_LTLIBRARIES = @plugin_revision_shared_target@
-ha_revision_la_LDFLAGS = -module -rpath $(pkgplugindir)
+ha_revision_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir)
 ha_revision_la_CXXFLAGS= $(AM_CFLAGS) $(MYSQL_OPTIONS) -DMYSQL_DYNAMIC_PLUGIN -DMYSQL_SERVER
 ha_revision_la_CFLAGS = $(AM_CFLAGS) $(MYSQL_OPTIONS) -DMYSQL_DYNAMIC_PLUGIN -DMYSQL_SERVER -std=c99
 ha_revision_la_SOURCES = ha_revision.cc double_table_handler.cc single_table_handler.cc
diff -Naur mysql-5.1.44/storage/sphinx/Makefile.am mysql-5.1.44.oden/storage/sphinx/Makefile.am
--- mysql-5.1.44/storage/sphinx/Makefile.am	2010-02-21 10:13:43.000000000 +0100
+++ mysql-5.1.44.oden/storage/sphinx/Makefile.am	2010-02-21 10:15:17.000000000 +0100
@@ -38,12 +38,12 @@
 EXTRA_LTLIBRARIES =	ha_sphinx.la
 pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la
 
-ha_sphinx_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
+ha_sphinx_la_LDFLAGS =	-module -avoid-version -rpath $(MYSQLLIBdir)
 ha_sphinx_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_sphinx_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_sphinx_la_SOURCES =	ha_sphinx.cc
 
-sphinx_la_LDFLAGS = -module -rpath $(pkgplugindir)
+sphinx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir)
 sphinx_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 sphinx_la_SOURCES = snippets_udf.cc
diff -Naur mysql-5.1.44/storage/spider/Makefile.am mysql-5.1.44.oden/storage/spider/Makefile.am
--- mysql-5.1.44/storage/spider/Makefile.am	2009-11-22 14:46:39.000000000 +0100
+++ mysql-5.1.44.oden/storage/spider/Makefile.am	2010-02-21 10:14:43.000000000 +0100
@@ -11,7 +11,7 @@
 lib_LTLIBRARIES       = $(PLUGIN_SPIDER_LTLIBRARIES_TARGET)
 EXTRA_LTLIBRARIES     = ha_spider.la
 pkgplugin_LTLIBRARIES = @plugin_spider_shared_target@
-ha_spider_la_LDFLAGS  = -shared -module -rpath $(pkgplugindir)
+ha_spider_la_LDFLAGS  = -shared -module -avoid-version -rpath $(pkgplugindir)
 ha_spider_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_spider_la_CFLAGS   = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
 ha_spider_la_SOURCES  = \