Commit 06f4146b authored by unknown's avatar unknown

Bug#18464

  "Can't make example storage engine available"
Build was attempting a shared-lib build instead of static


configure.in:
  configure example to be linked in
storage/csv/ha_tina.cc:
  don't want plugin symbols in mysqld
storage/example/Makefile.am:
  build as static library
storage/example/ha_example.cc:
  don't want plugin symbols in mysqld
parent 684a4bbb
......@@ -2465,7 +2465,8 @@ MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl
MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[
MYSQL_SETUP_BERKELEY_DB
])
MYSQL_STORAGE_ENGINE(example,,,,,no,storage/example,,,[
MYSQL_STORAGE_ENGINE(example,,,,,,storage/example,no,
\$(top_builddir)/storage/example/libexample.a,[
AC_CONFIG_FILES(storage/example/Makefile)
])
MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,,
......
......@@ -1037,6 +1037,7 @@ bool ha_tina::check_if_incompatible_data(HA_CREATE_INFO *info,
return COMPATIBLE_DATA_YES;
}
#ifdef MYSQL_PLUGIN
mysql_declare_plugin
{
MYSQL_STORAGE_ENGINE_PLUGIN,
......@@ -1049,4 +1050,4 @@ mysql_declare_plugin
0x0100 /* 1.0 */,
}
mysql_declare_plugin_end;
#endif
......@@ -26,11 +26,10 @@ INCLUDES = -I$(top_srcdir)/include \
-I$(srcdir)
WRAPLIBS=
pkglib_LTLIBRARIES = ha_example.la
pkglib_LIBRARIES = libexample.a
ha_example_la_LDFLAGS = -module
noinst_HEADERS = ha_example.h
ha_example_la_SOURCES = ha_example.cc
libexample_a_SOURCES = ha_example.cc
LDADD =
......
......@@ -726,6 +726,7 @@ int ha_example::create(const char *name, TABLE *table_arg,
DBUG_RETURN(0);
}
#ifdef MYSQL_PLUGIN
mysql_declare_plugin
{
MYSQL_STORAGE_ENGINE_PLUGIN,
......@@ -738,4 +739,4 @@ mysql_declare_plugin
0x0001 /* 0.1 */,
}
mysql_declare_plugin_end;
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment