maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/

------------------------------------------------------------
revno: 2745
revision-id: psergey@xxxxxxxxxxxx-20091001212739-x4mzj5e7u8pig71f
parent: psergey@xxxxxxxxxxxx-20091001104659-51vn4vtgjnqk1w27
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: mysql-5.1-maria-contd4
timestamp: Fri 2009-10-02 01:27:39 +0400
message:
  Temporary solution: skip PBXT (like we do e.g. for --skip-innodb) in embedded 
  server, as it doesn't work there.
=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2009-09-11 13:20:03 +0000
+++ b/sql/sql_plugin.cc	2009-10-01 21:27:39 +0000
@@ -1168,6 +1168,22 @@
           !my_strnncoll(&my_charset_latin1, (const uchar*) plugin->name,
                         6, (const uchar*) "InnoDB", 6))
         continue;
+#ifdef EMBEDDED_LIBRARY
+      /*
+        MariaDB: disable PBXT in embedded server. We do this for two reasons
+         - PBXT currently doesn't work in embedded server (see 
+         https://bugs.launchpad.net/maria/+bug/439889)
+         - Embedded server is supposed to be "leaner" and our current
+           understanding of that is "without PBXT". At the same time, we want
+           regular server to be with PBXT, and since we don't support compiling
+           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;
+
+#endif
       bzero(&tmp, sizeof(tmp));
       tmp.plugin= plugin;
       tmp.name.str= (char *)plugin->name;