database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Automatic merge with 5.5

Browse Source
This commit is contained in:
Michael Widenius
2012-09-01 00:54:54 +03:00
parent 5a86a61219 b45c551ee3
commit 1999be8d4e
760 changed files with 47838 additions and 5277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_plugin.cc
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);