diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-11 19:40:58 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-11 19:40:58 +0300 |
| commit | ebdef570e552b93b693398f42c229cf77ab85965 (patch) | |
| tree | ad3ff84791c35c7d8b2d47a60f0ea4cb409a0a31 /sql/sql_show.cc | |
| parent | 567671368723c704d60902b4d0ccff951b414552 (diff) | |
| parent | 684c7aba09583e54c5272cc3b0eec207afc87a39 (diff) | |
| download | mariadb-git-ebdef570e552b93b693398f42c229cf77ab85965.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
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 b9f5015f8f0..243e1ecf00b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -641,7 +641,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) thd->push_internal_handler(&view_error_suppressor); bool error= open_normal_and_derived_tables(thd, table_list, 0); thd->pop_internal_handler(); - if (error && thd->is_error()) + if (error && (thd->killed || thd->is_error())) DBUG_RETURN(TRUE); } |