diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-19 14:11:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-19 14:11:48 +0100 |
| commit | 3de04825514e4dc3fd6f1a8f5eb18a280f817699 (patch) | |
| tree | d5461ec6ad35812385dd5cfef327052838c471b4 /sql/sql_show.cc | |
| parent | 4f233c43b11b6f4f159350a192fa3fb3e3ce6c9a (diff) | |
| parent | 02b76970c5da2b836d322e4189cdde79a5c15f4c (diff) | |
| download | mariadb-git-3de04825514e4dc3fd6f1a8f5eb18a280f817699.tar.gz | |
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 b91dfeec011..bf92717e79d 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); } |