1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: option_type -> scope

Browse Source
This commit is contained in:
Sergei Golubchik 2014-08-29 13:59:08 +02:00
parent 99677cc510
commit 5389300f49
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/set_var.cc
View File

@ -565,7 +565,7 @@ static int show_cmp(SHOW_VAR *a, SHOW_VAR *b)
@param thd current thread @param thd current thread
@param sorted If TRUE, the system variables should be sorted @param sorted If TRUE, the system variables should be sorted
@param type OPT_GLOBAL or OPT_SESSION for SHOW GLOBAL|SESSION VARIABLES @param scope OPT_GLOBAL or OPT_SESSION for SHOW GLOBAL|SESSION VARIABLES
@retval @retval
pointer Array of SHOW_VAR elements for display pointer Array of SHOW_VAR elements for display
@ -573,7 +573,7 @@ static int show_cmp(SHOW_VAR *a, SHOW_VAR *b)
NULL FAILURE NULL FAILURE
*/ */
SHOW_VAR* enumerate_sys_vars(THD *thd, bool sorted, enum enum_var_type type) SHOW_VAR* enumerate_sys_vars(THD *thd, bool sorted, enum enum_var_type scope)
{ {
int count= system_variable_hash.records, i; int count= system_variable_hash.records, i;
int size= sizeof(SHOW_VAR) * (count + 1); int size= sizeof(SHOW_VAR) * (count + 1);
@ -588,7 +588,7 @@ SHOW_VAR* enumerate_sys_vars(THD *thd, bool sorted, enum enum_var_type type)
sys_var *var= (sys_var*) my_hash_element(&system_variable_hash, i); sys_var *var= (sys_var*) my_hash_element(&system_variable_hash, i);
// don't show session-only variables in SHOW GLOBAL VARIABLES // don't show session-only variables in SHOW GLOBAL VARIABLES
if (type == OPT_GLOBAL && var->check_type(type)) if (scope == OPT_GLOBAL && var->check_type(scope))
continue; continue;
show->name= var->name.str; show->name= var->name.str;

1
sql/sql_plugin.h
View File

@ -17,7 +17,6 @@
#ifndef _sql_plugin_h #ifndef _sql_plugin_h
#define _sql_plugin_h #define _sql_plugin_h
/* /*
the following #define adds server-only members to enum_mysql_show_type, the following #define adds server-only members to enum_mysql_show_type,
that is defined in plugin.h that is defined in plugin.h

31
sql/sql_show.cc
View File

@ -2902,7 +2902,7 @@ void remove_status_vars(SHOW_VAR *list)
static bool show_status_array(THD *thd, const char *wild, static bool show_status_array(THD *thd, const char *wild,
SHOW_VAR *variables, SHOW_VAR *variables,
enum enum_var_type value_type, enum enum_var_type scope,
struct system_status_var *status_var, struct system_status_var *status_var,
const char *prefix, TABLE *table, const char *prefix, TABLE *table,
bool ucase_names, bool ucase_names,
@ -2911,8 +2911,7 @@ static bool show_status_array(THD *thd, const char *wild,
my_aligned_storage<SHOW_VAR_FUNC_BUFF_SIZE, MY_ALIGNOF(long)> buffer; my_aligned_storage<SHOW_VAR_FUNC_BUFF_SIZE, MY_ALIGNOF(long)> buffer;
char * const buff= buffer.data; char * const buff= buffer.data;
char *prefix_end; char *prefix_end;
/* the variable name should not be longer than 64 characters */ char name_buffer[NAME_CHAR_LEN];
char name_buffer[64];
int len; int len;
SHOW_VAR tmp, *var; SHOW_VAR tmp, *var;
enum_check_fields save_count_cuted_fields= thd->count_cuted_fields; enum_check_fields save_count_cuted_fields= thd->count_cuted_fields;
@ -3002,7 +3001,7 @@ static bool show_status_array(THD *thd, const char *wild,
SHOW_TYPE show_type=var->type; SHOW_TYPE show_type=var->type;
if (show_type == SHOW_ARRAY) if (show_type == SHOW_ARRAY)
{ {
show_status_array(thd, wild, (SHOW_VAR *) var->value, value_type, show_status_array(thd, wild, (SHOW_VAR *) var->value, scope,
status_var, name_buffer, table, ucase_names, cond); status_var, name_buffer, table, ucase_names, cond);
} }
else else
@ -3021,7 +3020,7 @@ static bool show_status_array(THD *thd, const char *wild,
{ {
sys_var *var= ((sys_var *) value); sys_var *var= ((sys_var *) value);
show_type= var->show_type(); show_type= var->show_type();
value= (char*) var->value_ptr(thd, value_type, &null_lex_str); value= (char*) var->value_ptr(thd, scope, &null_lex_str);
charset= var->charset(thd); charset= var->charset(thd);
} }
@ -7225,19 +7224,19 @@ int fill_variables(THD *thd, TABLE_LIST *tables, COND *cond)
const char *wild= lex->wild ? lex->wild->ptr() : NullS; const char *wild= lex->wild ? lex->wild->ptr() : NullS;
enum enum_schema_tables schema_table_idx= enum enum_schema_tables schema_table_idx=
get_schema_table_idx(tables->schema_table); get_schema_table_idx(tables->schema_table);
enum enum_var_type option_type= OPT_SESSION; enum enum_var_type scope= OPT_SESSION;
bool upper_case_names= lex->sql_command != SQLCOM_SHOW_VARIABLES; bool upper_case_names= lex->sql_command != SQLCOM_SHOW_VARIABLES;
bool sorted_vars= lex->sql_command == SQLCOM_SHOW_VARIABLES; bool sorted_vars= lex->sql_command == SQLCOM_SHOW_VARIABLES;
if (lex->option_type == OPT_GLOBAL || if (lex->option_type == OPT_GLOBAL ||
schema_table_idx == SCH_GLOBAL_VARIABLES) schema_table_idx == SCH_GLOBAL_VARIABLES)
option_type= OPT_GLOBAL; scope= OPT_GLOBAL;
COND *partial_cond= make_cond_for_info_schema(cond, tables); COND *partial_cond= make_cond_for_info_schema(cond, tables);
mysql_rwlock_rdlock(&LOCK_system_variables_hash); mysql_rwlock_rdlock(&LOCK_system_variables_hash);
res= show_status_array(thd, wild, enumerate_sys_vars(thd, sorted_vars, option_type), res= show_status_array(thd, wild, enumerate_sys_vars(thd, sorted_vars, scope),
option_type, NULL, "", tables->table, scope, NULL, "", tables->table,
upper_case_names, partial_cond); upper_case_names, partial_cond);
mysql_rwlock_unlock(&LOCK_system_variables_hash); mysql_rwlock_unlock(&LOCK_system_variables_hash);
DBUG_RETURN(res); DBUG_RETURN(res);
@ -7253,25 +7252,25 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
STATUS_VAR *tmp1, tmp; STATUS_VAR *tmp1, tmp;
enum enum_schema_tables schema_table_idx= enum enum_schema_tables schema_table_idx=
get_schema_table_idx(tables->schema_table); get_schema_table_idx(tables->schema_table);
enum enum_var_type option_type; enum enum_var_type scope;
bool upper_case_names= lex->sql_command != SQLCOM_SHOW_STATUS; bool upper_case_names= lex->sql_command != SQLCOM_SHOW_STATUS;
if (lex->sql_command == SQLCOM_SHOW_STATUS) if (lex->sql_command == SQLCOM_SHOW_STATUS)
{ {
option_type= lex->option_type; scope= lex->option_type;
if (option_type == OPT_GLOBAL) if (scope == OPT_GLOBAL)
tmp1= &tmp; tmp1= &tmp;
else else
tmp1= thd->initial_status_var; tmp1= thd->initial_status_var;
} }
else if (schema_table_idx == SCH_GLOBAL_STATUS) else if (schema_table_idx == SCH_GLOBAL_STATUS)
{ {
option_type= OPT_GLOBAL; scope= OPT_GLOBAL;
tmp1= &tmp; tmp1= &tmp;
} }
else else
{ {
option_type= OPT_SESSION; scope= OPT_SESSION;
tmp1= &thd->status_var; tmp1= &thd->status_var;
} }
@ -7281,11 +7280,11 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
partial_cond->val_int(); partial_cond->val_int();
mysql_mutex_lock(&LOCK_status); mysql_mutex_lock(&LOCK_status);
if (option_type == OPT_GLOBAL) if (scope == OPT_GLOBAL)
calc_sum_of_all_status(&tmp); calc_sum_of_all_status(&tmp);
res= show_status_array(thd, wild, res= show_status_array(thd, wild,
(SHOW_VAR *)all_status_vars.buffer, (SHOW_VAR *)all_status_vars.buffer,
option_type, tmp1, "", tables->table, scope, tmp1, "", tables->table,
upper_case_names, partial_cond); upper_case_names, partial_cond);
mysql_mutex_unlock(&LOCK_status); mysql_mutex_unlock(&LOCK_status);
DBUG_RETURN(res); DBUG_RETURN(res);