mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.
This commit is contained in:
@@ -2900,6 +2900,7 @@ static uchar *intern_sys_var_ptr(THD* thd, int offset, bool global_lock)
|
||||
DBUG_ENTER("intern_sys_var_ptr");
|
||||
DBUG_ASSERT(offset >= 0);
|
||||
DBUG_ASSERT((uint)offset <= global_system_variables.dynamic_variables_head);
|
||||
mysql_mutex_assert_not_owner(&LOCK_open);
|
||||
|
||||
if (!thd)
|
||||
DBUG_RETURN((uchar*) global_system_variables.dynamic_variables_ptr + offset);
|
||||
@@ -3170,15 +3171,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:
|
||||
|
Reference in New Issue
Block a user