diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-12-15 11:03:24 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-12-15 11:03:24 +0200 |
| commit | d2e723bf53dd081fe6098feac66bf8934643a278 (patch) | |
| tree | 0b0c03eb80469219fffc0b9ea6887006b4668695 /sql/sql_show.cc | |
| parent | 838adcf2ff68464a7817d9cadf2fc8f6cbe95beb (diff) | |
| download | mariadb-git-d2e723bf53dd081fe6098feac66bf8934643a278.tar.gz | |
Bug #48985: show create table crashes if previous access to the table
was killed
Merge the fix from 5.1-bugteam to 5.1-main
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 2c1f360104b..e55000c0f65 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -719,7 +719,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->main_da.is_error()) + if (error && (thd->killed || thd->main_da.is_error())) DBUG_RETURN(TRUE); } |