Final fix for bad merge

f2b26ffb · monty@tik.mysql.fi · 5d58a49f · f2b26ffb
Commit f2b26ffb authored Jul 11, 2001 by monty@tik.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_show.cc sql/sql_show.cc +1 -1

No files found.
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -110,7 +110,7 @@ int mysqld_show_open_tables(THD *thd,const char *wild)
  if (send_fields(thd,field_list,1))
    DBUG_RETURN(1);

-  if (!(list_open_tables(thd,&tables,db,wild)) && thd->fatal_error)
+  if (!(open_list=list_open_tables(thd,wild)) && thd->fatal_error)
    DBUG_RETURN(-1);

  for ( ; open_list ; open_list=open_list->next)