forked from pool/mariadb
e99c0e19d4
- based on MySQL 5.1.50 maintenance update
- changelog:
http://kb.askmonty.org/v/mariadb-5150-changelog
- release notes:
http://kb.askmonty.org/v/mariadb-5150-release-notes
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=25
131 lines
6.1 KiB
Diff
131 lines
6.1 KiB
Diff
Index: storage/archive/Makefile.am
|
|
===================================================================
|
|
--- storage/archive/Makefile.am.orig
|
|
+++ storage/archive/Makefile.am
|
|
@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r
|
|
|
|
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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_archive_la_SOURCES = ha_archive.cc azio.c
|
|
Index: storage/blackhole/Makefile.am
|
|
===================================================================
|
|
--- storage/blackhole/Makefile.am.orig
|
|
+++ storage/blackhole/Makefile.am
|
|
@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h
|
|
|
|
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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_blackhole_la_SOURCES=ha_blackhole.cc
|
|
Index: storage/csv/Makefile.am
|
|
===================================================================
|
|
--- storage/csv/Makefile.am.orig
|
|
+++ storage/csv/Makefile.am
|
|
@@ -31,7 +31,7 @@ noinst_HEADERS = ha_tina.h transparent
|
|
|
|
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_CXXFLAGS) -DMYSQL_PLUGIN
|
|
ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc
|
|
|
|
Index: storage/example/Makefile.am
|
|
===================================================================
|
|
--- storage/example/Makefile.am.orig
|
|
+++ storage/example/Makefile.am
|
|
@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h
|
|
|
|
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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_example_la_SOURCES = ha_example.cc
|
|
Index: storage/federatedx/Makefile.am
|
|
===================================================================
|
|
--- storage/federatedx/Makefile.am.orig
|
|
+++ storage/federatedx/Makefile.am
|
|
@@ -19,7 +19,7 @@ noinst_HEADERS = ha_federatedx.h federat
|
|
|
|
EXTRA_LTLIBRARIES = ha_federatedx.la
|
|
pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@
|
|
-ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir)
|
|
+ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir)
|
|
ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
|
|
Index: storage/ibmdb2i/Makefile.am
|
|
===================================================================
|
|
--- storage/ibmdb2i/Makefile.am.orig
|
|
+++ storage/ibmdb2i/Makefile.am
|
|
@@ -33,7 +33,7 @@ noinst_HEADERS = ha_ibmdb2i.h db2i_colla
|
|
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_CXXFLAGS) -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 \
|
|
Index: storage/pbxt/src/Makefile.am
|
|
===================================================================
|
|
--- storage/pbxt/src/Makefile.am.orig
|
|
+++ storage/pbxt/src/Makefile.am
|
|
@@ -35,7 +35,7 @@ libpbxt_la_SOURCES = bsearch_xt.cc cache
|
|
systab_xt.cc ha_xtsys.cc discover_xt.cc backup_xt.cc \
|
|
util_xt.cc xaction_xt.cc xactlog_xt.cc lock_xt.cc locklist_xt.cc
|
|
|
|
-libpbxt_la_LDFLAGS = -module
|
|
+libpbxt_la_LDFLAGS = -module -avoid-version
|
|
|
|
# These are the warning Drizzle uses:
|
|
# DRIZZLE_WARNINGS = -W -Wall -Wextra -pedantic -Wundef -Wredundant-decls -Wno-strict-aliasing -Wno-long-long -Wno-unused-parameter
|
|
Index: storage/xtradb/Makefile.am
|
|
===================================================================
|
|
--- storage/xtradb/Makefile.am.orig
|
|
+++ storage/xtradb/Makefile.am
|
|
@@ -332,7 +332,7 @@ libxtradb_a_CFLAGS= $(AM_CFLAGS)
|
|
EXTRA_LTLIBRARIES= ha_xtradb.la
|
|
pkgplugin_LTLIBRARIES= @plugin_xtradb_shared_target@
|
|
|
|
-ha_xtradb_la_LDFLAGS= -module -rpath $(pkgplugindir)
|
|
+ha_xtradb_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir)
|
|
ha_xtradb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
|
|
ha_xtradb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
|
|
ha_xtradb_la_SOURCES= $(libxtradb_a_SOURCES)
|
|
Index: storage/federated/Makefile.am
|
|
===================================================================
|
|
--- storage/federated/Makefile.am.orig
|
|
+++ storage/federated/Makefile.am
|
|
@@ -32,7 +32,7 @@ noinst_HEADERS = ha_federated.h
|
|
|
|
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_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
|
|
ha_federated_la_SOURCES = ha_federated.cc $(top_srcdir)/mysys/string.c
|
|
Index: storage/innodb_plugin/Makefile.am
|
|
===================================================================
|
|
--- storage/innodb_plugin/Makefile.am.orig
|
|
+++ storage/innodb_plugin/Makefile.am
|
|
@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS)
|
|
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_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS)
|
|
ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
|
|
ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES)
|