valgrind error fix

72b7b7de · gluh@mysql.com/eagle.(none) · 579cce54 · 72b7b7de
Commit 72b7b7de authored May 16, 2007 by gluh@mysql.com/eagle.(none)
Show whitespace changes
Inline Side-by-side

Showing with 11 additions and 7 deletions

sql/sql_show.cc sql/sql_show.cc +11 -7

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -4546,8 +4546,15 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
  enum enum_var_type option_type;
  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;
    tmp1= &tmp;
@@ -4555,10 +4562,7 @@ int fill_status(THD *thd, TABLE_LIST *tables, COND *cond)
  else
  { 
    option_type= OPT_SESSION;
-    if (schema_table_idx == SCH_SESSION_STATUS)
    tmp1= &thd->status_var;
-    else
-      tmp1= thd->initial_status_var;
  }
  pthread_mutex_lock(&LOCK_status);