database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

valgrind error fix

Browse Source
This commit is contained in:
gluh@mysql.com/eagle.(none)
2007-05-16 19:19:23 +05:00
parent 579cce54ab
commit 72b7b7de24
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_show.cc
View File

@@ -4546,8 +4546,15 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
enum enum_var_type option_type; enum enum_var_type option_type;
bool upper_case_names= (schema_table_idx != SCH_STATUS); bool upper_case_names= (schema_table_idx != SCH_STATUS);
if (lex->option_type == OPT_GLOBAL || if (schema_table_idx == SCH_STATUS)
schema_table_idx == SCH_GLOBAL_STATUS) {
option_type= lex->option_type;
if (option_type == OPT_GLOBAL)
tmp1= &tmp;
else
tmp1= thd->initial_status_var;
}
else if (schema_table_idx == SCH_GLOBAL_STATUS)
{ {
option_type= OPT_GLOBAL; option_type= OPT_GLOBAL;
tmp1= &tmp; tmp1= &tmp;
@@ -4555,10 +4562,7 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
else else
{ {
option_type= OPT_SESSION; option_type= OPT_SESSION;
if (schema_table_idx == SCH_SESSION_STATUS) tmp1= &thd->status_var;
tmp1= &thd->status_var;
else
tmp1= thd->initial_status_var;
} }
pthread_mutex_lock(&LOCK_status); pthread_mutex_lock(&LOCK_status);