1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-22271: Follow-up fix of --embedded

Browse Source 
Since commit 7198c6ab2dc8f8286f6732824ab985a76ebaaddc
the ./mtr --embedded tests would fail to start innodb_plugin
because of an undefined reference to the symbol wsrep_log().

Let us define a stub for that function. The embedded server
is never built WITH_WSREP, but there are no separate storage
engine builds for the embedded server. Hence, by default,
the dynamic InnoDB storage engine plugin would be built WITH_WSREP
and it would fail to load into the embedded server library due to
a reference to the undefined symbol.
This commit is contained in:
Marko Mäkelä 2020-04-27 09:36:31 +03:00
parent 5d856760fb
commit d28ee189b7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sql/mysqld.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. /* Copyright (c) 2000, 2015, Oracle and/or its affiliates.
Copyright (c) 2008, 2018, MariaDB Copyright (c) 2008, 2020, MariaDB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1814,6 +1814,15 @@ static void close_server_sock()
#endif #endif
} }
#else /* EMBEDDED LIBRARY */
# ifndef _WIN32
/* Unfortunately, ha_innodb.so is by default built WITH_WSREP, and it
will be used for both the normal and the embedded server, while the
embedded server library is never built WITH_WSREP. We must define this
symbol in the embedded library, so that loading a dynamic InnoDB storage
engine plugin will work in the embedded server library. */
void wsrep_log(void (*)(const char *, ...), const char *, ...) {}
# endif
#endif /*EMBEDDED_LIBRARY*/ #endif /*EMBEDDED_LIBRARY*/