diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-06-09 23:29:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-06-09 23:29:18 +0200 |
| commit | 14e53d066807f7164d94dd8449ab4458509ada88 (patch) | |
| tree | 5c7a4cf40f06705ec897d6b3d35a2aff80ad9adb /storage/federated | |
| parent | c00c1b767e8bc6d65ba78e2dedd38ba56cdb3265 (diff) | |
| download | mariadb-git-14e53d066807f7164d94dd8449ab4458509ada88.tar.gz | |
allow federated and innodb_plugin to be built
storage/federated/Makefile.am:
federated needs functions from mysys/string.c.
mysqld does not use them, so they don't get into the binary.
storage/federated/plug.in:
enable federated again.
remove it from all configurations.
storage/federatedx/Makefile.am:
federatedx is now called federatedx in configure
storage/federatedx/ha_federatedx.cc:
federatedx is now called federatedx in configure
storage/federatedx/plug.in:
federatedx is now called federatedx in configure
storage/innodb_plugin/plug.in:
enable innodb plugin again.
remove it from all configurations.
storage/xtradb/CMakeLists.txt:
xtradb is now called xtradb in configure,
and builds libxtradb.a and ha_xtradb.so
storage/xtradb/Makefile.am:
xtradb is now called xtradb in configure,
and builds libxtradb.a and ha_xtradb.so
storage/xtradb/handler/ha_innodb.cc:
xtradb is now called xtradb in configure,
and builds libxtradb.a and ha_xtradb.so
storage/xtradb/plug.in:
xtradb is now called xtradb in configure,
and builds libxtradb.a and ha_xtradb.so
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/Makefile.am | 4 | ||||
| -rw-r--r-- | storage/federated/plug.in (renamed from storage/federated/plug.in.disabled) | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am index 64ea0207017..26786ee48cb 100644 --- a/storage/federated/Makefile.am +++ b/storage/federated/Makefile.am @@ -26,8 +26,6 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I$(srcdir) WRAPLIBS= -LDADD = - DEFS = @DEFS@ noinst_HEADERS = ha_federated.h @@ -37,7 +35,7 @@ pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ ha_federated_la_LDFLAGS = -module -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 +ha_federated_la_SOURCES = ha_federated.cc $(top_srcdir)/mysys/string.c EXTRA_LIBRARIES = libfederated.a diff --git a/storage/federated/plug.in.disabled b/storage/federated/plug.in index 23b607d699b..714888b2ebf 100644 --- a/storage/federated/plug.in.disabled +++ b/storage/federated/plug.in @@ -1,5 +1,5 @@ MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine], - [Connects to tables on remote MySQL servers], [max,max-no-ndb]) + [Connects to tables on remote MySQL servers], []) MYSQL_PLUGIN_STATIC(federated, [libfederated.a]) MYSQL_PLUGIN_DYNAMIC(federated, [ha_federated.la]) MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc]) |