summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authorVladimir Kolesnikov <vladimir@primebase.org>2009-12-09 22:39:23 +0100
committerVladimir Kolesnikov <vladimir@primebase.org>2009-12-09 22:39:23 +0100
commit8bc8de1ad3da108d741417f43ac40df771a66d1e (patch)
treea03d76f2783945d3b3f0b44647b5c11039721d0b /sql/sql_plugin.cc
parent06fb006a1de2ca55b72bc81107531947082b3bac (diff)
downloadmariadb-git-8bc8de1ad3da108d741417f43ac40df771a66d1e.tar.gz
fixed bug #439889: Embedded server asserts on startup because of pbxt
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc6
1 files changed, 3 insertions, 3 deletions
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));