Commit d281faf9 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: sql_show.cc

parent d508ef78
...@@ -2900,7 +2900,6 @@ void remove_status_vars(SHOW_VAR *list) ...@@ -2900,7 +2900,6 @@ 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 value_type,
...@@ -2915,7 +2914,6 @@ static bool show_status_array(THD *thd, const char *wild, ...@@ -2915,7 +2914,6 @@ static bool show_status_array(THD *thd, const char *wild,
/* the variable name should not be longer than 64 characters */ /* the variable name should not be longer than 64 characters */
char name_buffer[64]; char name_buffer[64];
int len; int len;
LEX_STRING null_lex_str;
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;
bool res= FALSE; bool res= FALSE;
...@@ -2923,8 +2921,6 @@ static bool show_status_array(THD *thd, const char *wild, ...@@ -2923,8 +2921,6 @@ static bool show_status_array(THD *thd, const char *wild,
DBUG_ENTER("show_status_array"); DBUG_ENTER("show_status_array");
thd->count_cuted_fields= CHECK_FIELD_WARN; thd->count_cuted_fields= CHECK_FIELD_WARN;
null_lex_str.str= 0; // For sys_var->value_ptr()
null_lex_str.length= 0;
prefix_end=strnmov(name_buffer, prefix, sizeof(name_buffer)-1); prefix_end=strnmov(name_buffer, prefix, sizeof(name_buffer)-1);
if (*prefix) if (*prefix)
...@@ -3095,13 +3091,6 @@ static bool show_status_array(THD *thd, const char *wild, ...@@ -3095,13 +3091,6 @@ static bool show_status_array(THD *thd, const char *wild,
if (!(pos= *(char**) value)) if (!(pos= *(char**) value))
pos= ""; pos= "";
DBUG_EXECUTE_IF("alter_server_version_str",
if (!my_strcasecmp(system_charset_info,
variables->name,
"version")) {
pos= "some-other-version";
});
end= strend(pos); end= strend(pos);
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment