1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

References lp:1051808 - merged with lp:maria/5.5

bzr merge lp:maria/5.5
...
Text conflict in CMakeLists.txt
Text conflict in sql/mysqld.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_truncate.cc
4 conflicts encountered.
This commit is contained in:
Seppo Jaakola
2012-09-17 12:31:38 +03:00
335 changed files with 9218 additions and 5001 deletions

View File

@ -907,7 +907,7 @@ bool plugin_is_ready(const LEX_STRING *name, int type)
}
SHOW_COMP_OPTION plugin_status(const char *name, int len, size_t type)
SHOW_COMP_OPTION plugin_status(const char *name, size_t len, int type)
{
LEX_STRING plugin_name= { (char *) name, len };
return plugin_status(&plugin_name, type);