Commit f2b26ffb authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi
Browse files

Final fix for bad merge

parent 5d58a49f

sql/sql_show.cc

+1 −1
Original line number Diff line number Diff line
@@ -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)