summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authormonty@tik.mysql.fi <>2001-07-10 15:53:08 +0300
committermonty@tik.mysql.fi <>2001-07-10 15:53:08 +0300
commitfc81fdb4ba76c25bb387ede8fd879a4392ea783e (patch)
tree6c8e56d350fb233a41c963d85544d41c0151c8ec /sql/sql_show.cc
parentca771c46bbe5e9ea7742902f9116f3e210e92fea (diff)
downloadmariadb-git-fc81fdb4ba76c25bb387ede8fd879a4392ea783e.tar.gz
Redefinition of myisam_bulk_insert_tree_size
Removed new error message Fixed test case for varbinary Threads are again killable in "merge_buffers" Cleanup of sql_repl.cc SHOW OPEN TABLES now works when no tables are opened
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 199d6a764e0..2fe8cc200af 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 (!(open_list=list_open_tables(thd,wild)))
+ if (!(open_list=list_open_tables(thd,wild)) && thd->fatal_error)
DBUG_RETURN(-1);
for ( ; open_list ; open_list=open_list->next)