diff options
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 73e9734280f..c23a956fad6 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -6598,10 +6598,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, if ((error= table->file->add_index(table, key_info, index_add_count, &add))) { -#ifdef MERGE_MONTY_ADDITION_THAT_BREAKS_5_5_TESTS /* Only report error if handler has not already reported an error */ - if (!thd->main_da.is_error()) -#endif + if (!thd->is_error()) { /* Exchange the key_info for the error message. If we exchange |