diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-05 14:38:20 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2011-09-05 14:38:20 +0200 |
| commit | 52d9e13ffcacee74e42bc436877f5f4eb1999e66 (patch) | |
| tree | bb79417a838e3a36862cd4d079d7e8368cf652ba /storage/federated | |
| parent | 85035bd2bbd5a4ec35a4fa29b2f0a6f6246d15f4 (diff) | |
| download | mariadb-git-52d9e13ffcacee74e42bc436877f5f4eb1999e66.tar.gz | |
Bug #11750417 40942: UNABLE TO INSTALL FEDERATED PLUGIN
Link plugin with a copy of string.o
Copied test from 5.5 but this was dysfunctional, made it work
Also tested on Windows
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am index e0dae69539e..9b4e74af0a7 100644 --- a/storage/federated/Makefile.am +++ b/storage/federated/Makefile.am @@ -37,14 +37,14 @@ pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ ha_federated_la_LDFLAGS = -module -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 +ha_federated_la_SOURCES = ha_federated.cc $(top_srcdir)/mysys/string.c EXTRA_LIBRARIES = libfederated.a noinst_LIBRARIES = @plugin_federated_static_target@ libfederated_a_CXXFLAGS = $(AM_CXXFLAGS) libfederated_a_CFLAGS = $(AM_CFLAGS) -libfederated_a_SOURCES= ha_federated.cc +libfederated_a_SOURCES= ha_federated.cc $(top_srcdir)/mysys/string.c EXTRA_DIST = CMakeLists.txt plug.in |