diff options
| author | unknown <serg@serg.mysql.com> | 2001-07-10 20:23:37 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-07-10 20:23:37 +0200 |
| commit | 4ecea7d3a0209e18427c2453e12b35b0c6aabb40 (patch) | |
| tree | 37fd4c550aa7b25316589a6520541c7a7c840264 /sql | |
| parent | bfefbf8b3b05f3cefe3dda0d8e1454af7237527e (diff) | |
| download | mariadb-git-4ecea7d3a0209e18427c2453e12b35b0c6aabb40.tar.gz | |
cleanups
myisam/mi_write.c:
cleanup
mysys/tree.c:
cleanup
sql/sql_show.cc:
bad merge fixed
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 8a4443f8a47..2a220f29670 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -114,7 +114,7 @@ int mysqld_show_open_tables(THD *thd,const char *db,const char *wild) if (send_fields(thd,field_list,1)) DBUG_RETURN(1); - if (!(open_list=list_open_tables(thd,wild)) && thd->fatal_error) + if (!(list_open_tables(thd,&tables,db,wild)) && thd->fatal_error) DBUG_RETURN(-1); List_iterator<char> it(tables); |