diff options
author | unknown <monty@tik.mysql.fi> | 2001-07-11 10:49:27 +0300 |
---|---|---|
committer | unknown <monty@tik.mysql.fi> | 2001-07-11 10:49:27 +0300 |
commit | e28dcf14ca7c16d17a3e47cf301c887d97579302 (patch) | |
tree | 8740ea9ca7f87a2d266a7e025cbd0cdb6e676924 /sql | |
parent | b2c6f600eba01661f1e76540883421c0e0451f3c (diff) | |
download | mariadb-git-e28dcf14ca7c16d17a3e47cf301c887d97579302.tar.gz |
Final fix for bad merge
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 507139de1eb..4ed59f7d1b0 100644 --- 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) |