mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
Bug#18464
"Can't make example storage engine available" Build was attempting a shared-lib build instead of static
This commit is contained in:
parent
7f674749b8
commit
f6febdb95a
4 changed files with 8 additions and 6 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue