From dd4124c22430dd2f245afbf9a20cfea303de3320 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 22 Apr 2020 13:21:43 +0200
Subject: [PATCH] MDEV-22271 Excessive stack memory usage due to WSREP_LOG
fix embedded innodb_plugin tests
followup for 7198c6ab2dc
---
sql/mysqld.cc | 9 ---------
sql/wsrep_dummy.cc | 4 ++++
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ff3faaa92bc..594f50b72f2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1814,15 +1814,6 @@ static void close_server_sock()
#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*/
diff --git a/sql/wsrep_dummy.cc b/sql/wsrep_dummy.cc
index 43cea8bad42..364ef2d3e7a 100644
--- a/sql/wsrep_dummy.cc
+++ b/sql/wsrep_dummy.cc
@@ -141,3 +141,7 @@ void wsrep_unlock_rollback()
void wsrep_set_data_home_dir(const char *)
{ }
+
+void wsrep_log(void (*)(const char *, ...), const char *, ...)
+{
+}