diff --git a/sql/sql_class.h b/sql/sql_class.h
index 3808fb68a01..7a5e3963a9c 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -2692,7 +2692,7 @@ public:
   bool send_data(List<Item> &items);
   bool initialize_tables (JOIN *join);
   void send_error(uint errcode,const char *err);
-  int  do_updates (bool from_send_error);
+  int  do_updates();
   bool send_eof();
   virtual void abort();
 };
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 1e9b7da1c81..e2dfd89aa32 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1729,7 +1729,7 @@ void multi_update::abort()
          todo/fixme: do_update() is never called with the arg 1.
          should it change the signature to become argless?
       */
-      VOID(do_updates(0));
+      VOID(do_updates());
     }
   }
   if (thd->transaction.stmt.modified_non_trans_table)
@@ -1760,7 +1760,7 @@ void multi_update::abort()
 }
 
 
-int multi_update::do_updates(bool from_send_error)
+int multi_update::do_updates()
 {
   TABLE_LIST *cur_table;
   int local_error= 0;
@@ -1907,7 +1907,6 @@ int multi_update::do_updates(bool from_send_error)
   DBUG_RETURN(0);
 
 err:
-  if (!from_send_error)
   {
     thd->fatal_error();
     prepare_record_for_error_message(local_error, table);
@@ -1949,7 +1948,7 @@ bool multi_update::send_eof()
      Does updates for the last n - 1 tables, returns 0 if ok;
      error takes into account killed status gained in do_updates()
   */
-  int local_error = (table_count) ? do_updates(0) : 0;
+  int local_error = (table_count) ? do_updates() : 0;
   /*
     if local_error is not set ON until after do_updates() then
     later carried out killing should not affect binlogging.