From 8bc8de1ad3da108d741417f43ac40df771a66d1e Mon Sep 17 00:00:00 2001
From: Vladimir Kolesnikov <vladimir@primebase.org>
Date: Wed, 9 Dec 2009 22:39:23 +0100
Subject: [PATCH] fixed bug #439889: Embedded server asserts on startup because
 of pbxt

---
 config/ac-macros/plugins.m4  | 12 +++++++-----
 sql/sql_plugin.cc            |  6 +++---
 storage/pbxt/plug.in         |  1 +
 storage/pbxt/src/Makefile.am |  2 --
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4
index 41abdd159f2..8cccce037a2 100644
--- a/config/ac-macros/plugins.m4
+++ b/config/ac-macros/plugins.m4
@@ -463,11 +463,13 @@ dnl Although this is "pretty", it breaks libmysqld build
       mysql_plugin_defs="$mysql_plugin_defs, [builtin_]$2[_plugin]"
       [with_plugin_]$2=yes
       AC_MSG_RESULT([yes])
-      m4_ifdef([$11],[
-       condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp($11, [[^/]+$], [\&])"
-       condition_dependent_plugin_objects="$condition_dependent_plugin_objects m4_bregexp($11, [[^/]+\.], [\&o])"
-       condition_dependent_plugin_links="$condition_dependent_plugin_links $6/$11"
-       condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp($11, [^.+[/$]], [\&])"
+      m4_ifdef([$11], [
+        m4_foreach([plugin], [$11], [
+           condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp(plugin, [[^/]+$], [\&])"
+           condition_dependent_plugin_objects="$condition_dependent_plugin_objects m4_bregexp(plugin, [[^/]+\.], [\&o])"
+           condition_dependent_plugin_links="$condition_dependent_plugin_links $6/plugin"
+           condition_dependent_plugin_includes="$condition_dependent_plugin_includes -I[\$(top_srcdir)]/$6/m4_bregexp(plugin, [^.+[/$]], [\&])"
+        ])
       ])
     fi
   fi
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 37e5a583840..c9492903983 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -1179,9 +1179,9 @@ int plugin_init(int *argc, char **argv, int flags)
            embedded server with different options than the regular server,
            the only way was to disable PBXT from here.
       */
-      if (!my_strnncoll(&my_charset_latin1, (const uchar*) plugin->name,
-                        4, (const uchar*) "PBXT", 4))
-        continue;
+      //if (!my_strnncoll(&my_charset_latin1, (const uchar*) plugin->name,
+      //                  4, (const uchar*) "PBXT", 4))
+      //  continue;
 
 #endif
       bzero(&tmp, sizeof(tmp));
diff --git a/storage/pbxt/plug.in b/storage/pbxt/plug.in
index 67a8e7b0ac9..02c5d8adcbe 100644
--- a/storage/pbxt/plug.in
+++ b/storage/pbxt/plug.in
@@ -5,3 +5,4 @@ MYSQL_PLUGIN_STATIC(pbxt,    [src/libpbxt.a])
 MYSQL_PLUGIN_ACTIONS(pbxt,  [
 #               AC_CONFIG_FILES(storage/pbxt/src/Makefile)
                ])
+MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(pbxt, [[src/ha_pbxt.cc],[src/myxt_xt.cc],[src/discover_xt.cc]])
diff --git a/storage/pbxt/src/Makefile.am b/storage/pbxt/src/Makefile.am
index a09d8f0a57b..8b8add48aa5 100644
--- a/storage/pbxt/src/Makefile.am
+++ b/storage/pbxt/src/Makefile.am
@@ -46,7 +46,5 @@ libpbxt_la_CFLAGS =		$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -std=c99
 EXTRA_LIBRARIES =		libpbxt.a
 noinst_LIBRARIES = 		libpbxt.a
 libpbxt_a_SOURCES =		$(libpbxt_la_SOURCES)
-libpbxt_a_CXXFLAGS =	$(AM_CXXFLAGS)
-libpbxt_a_CFLAGS =		$(AM_CFLAGS) -std=c99
 
 EXTRA_DIST =			pbms_enabled.cc win_inttypes.h