diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-06-20 14:35:58 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-06-21 18:48:14 +0200 |
| commit | 911af69d1e13e5dff43b550da19d3d4a0ae07e96 (patch) | |
| tree | 27765d030dc686796f6c6de18f692b4cb8d637d0 /sql | |
| parent | 8255781d9b4fa81f330ec5e021de60d6f552447d (diff) | |
| download | mariadb-git-911af69d1e13e5dff43b550da19d3d4a0ae07e96.tar.gz | |
MDEV-5973: MySQL Bug#11757486:49539: NON-DESCRIPTIVE ERR (ERROR 0 FROM STORAGE ENGINE) WITH MULTI-TABLE UPDATE
Condition in processing IGNORE clause for UPDATE & multi-table UPDATE made the same.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 2507c3fec53..b2af075e2f4 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1584,7 +1584,7 @@ bool mysql_multi_update(THD *thd, DBUG_RETURN(TRUE); } - thd->abort_on_warning= thd->is_strict_mode(); + thd->abort_on_warning= !ignore && thd->is_strict_mode(); List<Item> total_list; res= mysql_select(thd, &select_lex->ref_pointer_array, |