diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
| commit | 07502da170175bcdeea3616b6217c81eba5f3f8c (patch) | |
| tree | 32a6f432080d9125b3619f8935eb5b1de00e861d /sql/sql_show.cc | |
| parent | 08d9ffea601302cf98c131f296db08ebd9d36598 (diff) | |
| parent | 3c1a9886f4f1b007ddf122b8cfea17408026308d (diff) | |
| download | mariadb-git-07502da170175bcdeea3616b6217c81eba5f3f8c.tar.gz | |
Merge with MySQL 5.1.42mariadb-merge-mysql-5.1.42
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()
storage/xtradb/handler/ha_innodb.cc:
Call explain_filename() to get proper names for partitioned tables
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 01d82f994e7..cc3b68c51c8 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -721,7 +721,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); } |