diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-02 12:22:17 +0300 |
| commit | 3147bdd0ac34a5c62158b8c28da6ca77e0901f08 (patch) | |
| tree | 919a1043e20b3f1f6a58331ae90a4a9529b0ab5e /sql/sql_show.cc | |
| parent | 2c6015e8dc962bef8f353af920581d9b6bd7fd82 (diff) | |
| parent | 5bce1e06429c3d58457051f0c439f130609df375 (diff) | |
| download | mariadb-git-3147bdd0ac34a5c62158b8c28da6ca77e0901f08.tar.gz | |
Merge next-mr -> next-4284.
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 349e9948eb8..54d1400e3af 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); } |