mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.5 merge

Browse source
This commit is contained in:
Sergei Golubchik 2014-05-09 12:35:11 +02:00
commit d3e2e1243b
1865 changed files with 92783 additions and 80381 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sql/sql_plugin.cc
View file

@ -3207,15 +3207,21 @@ static void plugin_vars_free_values(sys_var *vars)
static SHOW_TYPE pluginvar_show_type(st_mysql_sys_var *plugin_var)
{
switch (plugin_var->flags & PLUGIN_VAR_TYPEMASK) {
switch (plugin_var->flags & (PLUGIN_VAR_TYPEMASK | PLUGIN_VAR_UNSIGNED)) {
case PLUGIN_VAR_BOOL:
return SHOW_MY_BOOL;
case PLUGIN_VAR_INT:
return SHOW_INT;
return SHOW_SINT;
case PLUGIN_VAR_INT | PLUGIN_VAR_UNSIGNED:
return SHOW_UINT;
case PLUGIN_VAR_LONG:
return SHOW_LONG;
return SHOW_SLONG;
case PLUGIN_VAR_LONG | PLUGIN_VAR_UNSIGNED:
return SHOW_ULONG;
case PLUGIN_VAR_LONGLONG:
return SHOW_LONGLONG;
return SHOW_SLONGLONG;
case PLUGIN_VAR_LONGLONG | PLUGIN_VAR_UNSIGNED:
return SHOW_ULONGLONG;
case PLUGIN_VAR_STR:
return SHOW_CHAR_PTR;
case PLUGIN_VAR_ENUM: