diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-11-13 09:20:40 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-11-13 09:20:40 +0100 |
| commit | 55791c1a773552fdbb16bfb5a730d2371ced0418 (patch) | |
| tree | 07b47068aef3fa6eb50acac344224dd37d437019 /sql | |
| parent | fbc8768ce5dd790af93df2385731216338d76c42 (diff) | |
| download | mariadb-git-55791c1a773552fdbb16bfb5a730d2371ced0418.tar.gz | |
Revert incorrect/redundant fix for old BUG#34656
The real bug was that open_tables() returned error in case of
thd->killed() without properly calling thd->send_kill_message()
to set the correct error. This was fixed some time ago.
So remove the, now redundant, extra checks for thd->is_error(),
possibly allowing to catch in debug builds more incorrect
error handling cases.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 3135da36da1..70173fb354f 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5285,13 +5285,10 @@ err: const char *error= thd->is_error() ? thd->get_stmt_da()->message() : ""; table->field[20]->store(error, strlen(error), cs); - if (thd->is_error()) - { - push_warning(thd, Sql_condition::WARN_LEVEL_WARN, - thd->get_stmt_da()->sql_errno(), - thd->get_stmt_da()->message()); - thd->clear_error(); - } + push_warning(thd, Sql_condition::WARN_LEVEL_WARN, + thd->get_stmt_da()->sql_errno(), + thd->get_stmt_da()->message()); + thd->clear_error(); } DBUG_RETURN(schema_table_store_record(thd, table)); @@ -5452,10 +5449,9 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables, I.e. we are in SELECT FROM INFORMATION_SCHEMA.COLUMS rather than in SHOW COLUMNS */ - if (thd->is_error()) - push_warning(thd, Sql_condition::WARN_LEVEL_WARN, - thd->get_stmt_da()->sql_errno(), - thd->get_stmt_da()->message()); + push_warning(thd, Sql_condition::WARN_LEVEL_WARN, + thd->get_stmt_da()->sql_errno(), + thd->get_stmt_da()->message()); thd->clear_error(); res= 0; } |