Final fix for bad merge
This commit is contained in:
parent
b2c6f600eb
commit
e28dcf14ca
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user