diff options
| author | unknown <kostja@bodhi.(none)> | 2007-12-14 02:23:42 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-12-14 02:23:42 +0300 |
| commit | a6eec72e7bcf1ef04dd4569e51fa8845cb192fc1 (patch) | |
| tree | 3b3887e68f6e5c803b2f7272f4a73f42d8dfd5ca /sql/sql_update.cc | |
| parent | 68c6ff09e1c8b4a1dfbd6686d7a1f800b689e233 (diff) | |
| download | mariadb-git-a6eec72e7bcf1ef04dd4569e51fa8845cb192fc1.tar.gz | |
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.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 7 |
1 files changed, 3 insertions, 4 deletions
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. |