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/federatedx | |
| 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/federatedx')
| -rw-r--r-- | storage/federatedx/Makefile.am | 4 | ||||
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 2 | ||||
| -rw-r--r-- | storage/federatedx/plug.in | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/storage/federatedx/Makefile.am b/storage/federatedx/Makefile.am index ad1328247ec..1781a53a0b6 100644 --- a/storage/federatedx/Makefile.am +++ b/storage/federatedx/Makefile.am @@ -18,14 +18,14 @@ DEFS = @DEFS@ noinst_HEADERS = ha_federatedx.h federatedx_probes.h EXTRA_LTLIBRARIES = ha_federatedx.la -pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ +pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_federatedx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_federatedx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN EXTRA_LIBRARIES = libfederatedx.a -noinst_LIBRARIES = @plugin_federated_static_target@ +noinst_LIBRARIES = @plugin_federatedx_static_target@ libfederatedx_a_CXXFLAGS = $(AM_CFLAGS) libfederatedx_a_CFLAGS = $(AM_CFLAGS) libfederatedx_a_SOURCES= ha_federatedx.cc federatedx_txn.cc \ diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 2c74b2f6675..57bfb1148bf 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -3495,7 +3495,7 @@ int ha_federatedx::rollback(handlerton *hton, MYSQL_THD thd, bool all) struct st_mysql_storage_engine federatedx_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; -mysql_declare_plugin(federated) +mysql_declare_plugin(federatedx) { MYSQL_STORAGE_ENGINE_PLUGIN, &federatedx_storage_engine, diff --git a/storage/federatedx/plug.in b/storage/federatedx/plug.in index ee2e6af0e94..95afe270f4c 100644 --- a/storage/federatedx/plug.in +++ b/storage/federatedx/plug.in @@ -1,5 +1,5 @@ -MYSQL_STORAGE_ENGINE(federated,,[FederatedX Storage Engine], +MYSQL_STORAGE_ENGINE(federatedx,,[FederatedX Storage Engine], [FederatedX Storage Engine], [max,max-no-ndb]) -MYSQL_PLUGIN_DYNAMIC(federated, [ha_federatedx.la]) -MYSQL_PLUGIN_STATIC(federated, [libfederatedx.a]) -MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federatedx.cc]) +MYSQL_PLUGIN_DYNAMIC(federatedx, [ha_federatedx.la]) +MYSQL_PLUGIN_STATIC(federatedx, [libfederatedx.a]) +MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federatedx, [ha_federatedx.cc]) |