From 8cfa6c3f33d28052aadfed2efb8ef41d03bb97e7 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Thu, 26 Apr 2012 19:21:37 +0200
Subject: 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
---
 sql/sql_update.cc | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'sql/sql_update.cc')

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);
-- 
cgit v1.2.1