Remove an unused argument of sql_update::do_updates().
sql/sql_class.h: Remove an unused argument. sql/sql_update.cc: Remove an unused argument.
This commit is contained in:
parent
68c6ff09e1
commit
a6eec72e7b
@ -2692,7 +2692,7 @@ public:
|
|||||||
bool send_data(List<Item> &items);
|
bool send_data(List<Item> &items);
|
||||||
bool initialize_tables (JOIN *join);
|
bool initialize_tables (JOIN *join);
|
||||||
void send_error(uint errcode,const char *err);
|
void send_error(uint errcode,const char *err);
|
||||||
int do_updates (bool from_send_error);
|
int do_updates();
|
||||||
bool send_eof();
|
bool send_eof();
|
||||||
virtual void abort();
|
virtual void abort();
|
||||||
};
|
};
|
||||||
|
@ -1729,7 +1729,7 @@ void multi_update::abort()
|
|||||||
todo/fixme: do_update() is never called with the arg 1.
|
todo/fixme: do_update() is never called with the arg 1.
|
||||||
should it change the signature to become argless?
|
should it change the signature to become argless?
|
||||||
*/
|
*/
|
||||||
VOID(do_updates(0));
|
VOID(do_updates());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (thd->transaction.stmt.modified_non_trans_table)
|
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;
|
TABLE_LIST *cur_table;
|
||||||
int local_error= 0;
|
int local_error= 0;
|
||||||
@ -1907,7 +1907,6 @@ int multi_update::do_updates(bool from_send_error)
|
|||||||
DBUG_RETURN(0);
|
DBUG_RETURN(0);
|
||||||
|
|
||||||
err:
|
err:
|
||||||
if (!from_send_error)
|
|
||||||
{
|
{
|
||||||
thd->fatal_error();
|
thd->fatal_error();
|
||||||
prepare_record_for_error_message(local_error, table);
|
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;
|
Does updates for the last n - 1 tables, returns 0 if ok;
|
||||||
error takes into account killed status gained in do_updates()
|
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
|
if local_error is not set ON until after do_updates() then
|
||||||
later carried out killing should not affect binlogging.
|
later carried out killing should not affect binlogging.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user