summaryrefslogtreecommitdiff
path: root/storage/federated
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-11-23 19:32:14 +0200
committerMichael Widenius <monty@askmonty.org>2011-11-23 19:32:14 +0200
commit7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc (patch)
treebab573449ec11585c1b5149c7cbf477178caa469 /storage/federated
parentc8768a091ac2d876216582813aaab7d9663008f7 (diff)
parentf28e7bd0645d478d33d7ae3b974931c7991cd0bd (diff)
downloadmariadb-git-7b368e3810feda53fc0dbdf5bfe8863f82f0bbcc.tar.gz
Merge with MySQL 5.1.60
Diffstat (limited to 'storage/federated')
-rw-r--r--storage/federated/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am
index 7db392ed2a2..31778a24550 100644
--- a/storage/federated/Makefile.am
+++ b/storage/federated/Makefile.am
@@ -40,7 +40,7 @@ ha_federated_la_SOURCES = ha_federated.cc $(top_srcdir)/mysys/string.c
noinst_LTLIBRARIES = @plugin_federated_static_target@ @plugin_federated_embedded_static_target@
libfederated_la_CXXFLAGS = $(AM_CXXFLAGS)
-libfederated_la_SOURCES= ha_federated.cc
+libfederated_la_SOURCES= ha_federated.cc $(top_srcdir)/mysys/string.c
libfederated_embedded_la_CXXFLAGS = $(AM_CXXFLAGS) @plugin_embedded_defs@
libfederated_embedded_la_CFLAGS = $(AM_CFLAGS) @plugin_embedded_defs@