diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-02-26 15:41:27 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-02-26 15:41:27 +0400 |
| commit | cac14b92252b3e7bcbebb8090cdeb2ac47143d1d (patch) | |
| tree | f18ba7b38db05b4528dcb2f64bedb793a051593a /sql/sql_table.cc | |
| parent | 2c734c980ef0292e00fc26492f17eb412907688a (diff) | |
| download | mariadb-git-cac14b92252b3e7bcbebb8090cdeb2ac47143d1d.tar.gz | |
MDEV-17725 Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())' failed in Diagnostics_area::set_ok_status upon ALTER failing due to error from engine
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 1227f144348..af40ae23a6c 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -10021,11 +10021,14 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to, to->file->ha_table_flags() & HA_TABLE_SCAN_ON_INDEX) { char warn_buff[MYSQL_ERRMSG_SIZE]; + bool save_abort_on_warning= thd->abort_on_warning; + thd->abort_on_warning= false; my_snprintf(warn_buff, sizeof(warn_buff), "ORDER BY ignored as there is a user-defined clustered index" " in the table '%-.192s'", from->s->table_name.str); push_warning(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, warn_buff); + thd->abort_on_warning= save_abort_on_warning; } else { |