diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-26 19:21:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-26 19:21:37 +0200 |
| commit | 8cfa6c3f33d28052aadfed2efb8ef41d03bb97e7 (patch) | |
| tree | 66397b9ba036039bf70118f73c1d140b8acb851a /sql/sql_update.cc | |
| parent | c04786d3e3d4fad53b46604ce37643f3ea4da1fa (diff) | |
| download | mariadb-git-8cfa6c3f33d28052aadfed2efb8ef41d03bb97e7.tar.gz | |
MDEV-216 lp:976104 - Assertion `0' failed in my_message_sql on UPDATE IGNORE, or unknown error on release build
Don't send_error at the end of mysql_multi_update() if select failed.
The error, if there was any, was already sent by mysql_select
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index cf03cc597c8..4f816e5f032 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1293,11 +1293,7 @@ bool mysql_multi_update(THD *thd, DBUG_PRINT("info",("res: %d report_error: %d", res, (int) thd->is_error())); res|= thd->is_error(); if (unlikely(res)) - { - /* If we had a another error reported earlier then this will be ignored */ - result->send_error(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR)); result->abort(); - } delete result; thd->abort_on_warning= 0; DBUG_RETURN(FALSE); |