Commit 614b0f68 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)
Browse files

Remove an unused argument of sql_update::do_updates().

parent 7c8fe302

sql/sql_class.h

+1 −1
Original line number Diff line number Diff line
@@ -2692,7 +2692,7 @@ class multi_update :public select_result_interceptor 
  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();

};

sql/sql_update.cc

+3 −4
Original line number Diff line number Diff line
@@ -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.