diff options
| author | unknown <monty@tik.mysql.fi> | 2001-07-10 16:09:15 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-07-10 16:09:15 +0300 |
| commit | bfefbf8b3b05f3cefe3dda0d8e1454af7237527e (patch) | |
| tree | 70d1bba8d49381f882d2acbcf6fcaa3d6f15a284 /sql/sql_show.cc | |
| parent | 1dd0fe2e78dcdd44ca1ff444c20049678d2d12bf (diff) | |
| parent | 9914a0c8471b9ee1f041b13c11211fe277cfcd91 (diff) | |
| download | mariadb-git-bfefbf8b3b05f3cefe3dda0d8e1454af7237527e.tar.gz | |
merge
Docs/manual.texi:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -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 000994d5d1f..8a4443f8a47 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 (list_open_tables(thd,&tables,db,wild)) + if (!(open_list=list_open_tables(thd,wild)) && thd->fatal_error) DBUG_RETURN(-1); List_iterator<char> it(tables); |