diff options
| -rw-r--r-- | sql/sql_parse.cc | 3 | ||||
| -rw-r--r-- | sql/sql_update.cc | 5 | ||||
| -rw-r--r-- | sql/sql_update.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7cc950f7d51..e3a017a491a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4579,8 +4579,7 @@ end_with_restore_list: select_lex->order_list.elements, select_lex->order_list.first, unit->select_limit_cnt, - lex->duplicates, lex->ignore, - &found, &updated); + lex->ignore, &found, &updated); MYSQL_UPDATE_DONE(res, found, updated); /* mysql_update return 2 if we need to switch to multi-update */ if (up_result != 2) diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 959747acf28..1d7dec31d56 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -279,7 +279,6 @@ static void prepare_record_for_error_message(int error, TABLE *table) order_num number of elemen in ORDER BY clause order ORDER BY clause list limit limit clause - handle_duplicates how to handle duplicates RETURN 0 - OK @@ -294,8 +293,8 @@ int mysql_update(THD *thd, List<Item> &values, COND *conds, uint order_num, ORDER *order, - ha_rows limit, - enum enum_duplicates handle_duplicates, bool ignore, + ha_rows limit, + bool ignore, ha_rows *found_return, ha_rows *updated_return) { bool using_limit= limit != HA_POS_ERROR; diff --git a/sql/sql_update.h b/sql/sql_update.h index 4c6f89d8468..8457fe8f154 100644 --- a/sql/sql_update.h +++ b/sql/sql_update.h @@ -31,8 +31,7 @@ bool check_unique_table(THD *thd, TABLE_LIST *table_list); int mysql_update(THD *thd,TABLE_LIST *tables,List<Item> &fields, List<Item> &values,COND *conds, uint order_num, ORDER *order, ha_rows limit, - enum enum_duplicates handle_duplicates, bool ignore, - ha_rows *found_return, ha_rows *updated_return); + bool ignore, ha_rows *found_return, ha_rows *updated_return); bool mysql_multi_update(THD *thd, TABLE_LIST *table_list, List<Item> *fields, List<Item> *values, COND *conds, ulonglong options, |