database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

lp:730035 Handlersocket does not load

Browse Source 
-fimplicit-termplates must be in CXXFLAGS not in handlersocket_la_CXXFLAGS.
otehrwise automake puts it in the command line too early to override
global -fno-implicit-templates
This commit is contained in:
Sergei Golubchik
2011-04-19 14:34:40 +02:00
parent a51fccc8dd
commit b315c62bf1
4 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

@ -2444,7 +2444,7 @@ sub setup_vardir() {
} }
else else
{ {
for (<$bindir/storage/*/.libs/*.so>,<$bindir/plugin/*/.libs/*.so>,<$bindir/sql/.libs/*.so>) for (<$bindir/storage/*/.libs/*.so>,<$bindir/plugin/*/.libs/*.so>,<$bindir/plugin/*/*/.libs/*.so>,<$bindir/sql/.libs/*.so>)
{ {
my $pname=basename($_); my $pname=basename($_);
symlink rel2abs($_), "$plugindir/$pname"; symlink rel2abs($_), "$plugindir/$pname";

13
mysql-test/r/handlersocket.result Normal file
View File

@ -0,0 +1,13 @@
install plugin handlersocket soname 'handlersocket.so';
select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket';
plugin_name handlersocket
plugin_version 1.0
plugin_status ACTIVE
plugin_type DAEMON
plugin_library handlersocket.so
plugin_library_version 0.0
plugin_author higuchi dot akira at dena dot jp
plugin_license
plugin_maturity Unknown
plugin_auth_version Unknown
uninstall plugin handlersocket;

11
mysql-test/t/handlersocket.test Normal file
View File

@ -0,0 +1,11 @@
--source include/have_dynamic_loading.inc
--source include/not_windows_embedded.inc
if (`select length('$HANDLERSOCKET_SO') = 0`) {
skip handlersocket plugin is not built;
}
install plugin handlersocket soname 'handlersocket.so';
--query_vertical select plugin_name, plugin_version, plugin_status, plugin_type, plugin_library, plugin_library_version, plugin_author, plugin_description plugin_license, plugin_maturity, plugin_auth_version from information_schema.plugins where plugin_name = 'handlersocket'
uninstall plugin handlersocket;

3
plugin/handler_socket/handlersocket/Makefile.am
View File

@ -1,7 +1,8 @@
pkgplugindir = $(PLUGIN_DIR) pkgplugindir = $(PLUGIN_DIR)
CXXFLAGS += -fimplicit-templates
noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp
pkgplugin_LTLIBRARIES = handlersocket.la pkgplugin_LTLIBRARIES = handlersocket.la
handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la
handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -fimplicit-templates -I$(srcdir)/../libhsclient handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -I$(srcdir)/../libhsclient
handlersocket_la_SOURCES = database.cpp handlersocket.cpp \ handlersocket_la_SOURCES = database.cpp handlersocket.cpp \
hstcpsvr_worker.cpp hstcpsvr.cpp hstcpsvr_worker.cpp hstcpsvr.cpp