1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unused argument

Browse Source
This commit is contained in:
Eugene Kosov 2018-06-01 21:39:38 +03:00 committed by Sergey Vojtovich
parent 8e9c5d1057
commit 67b601c503
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_parse.cc
View File

@ -4579,8 +4579,7 @@ end_with_restore_list:
select_lex->order_list.elements, select_lex->order_list.elements,
select_lex->order_list.first, select_lex->order_list.first,
unit->select_limit_cnt, unit->select_limit_cnt,
lex->duplicates, lex->ignore, lex->ignore, &found, &updated);
&found, &updated);
MYSQL_UPDATE_DONE(res, found, updated); MYSQL_UPDATE_DONE(res, found, updated);
/* mysql_update return 2 if we need to switch to multi-update */ /* mysql_update return 2 if we need to switch to multi-update */
if (up_result != 2) if (up_result != 2)

5
sql/sql_update.cc
View File

@ -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_num number of elemen in ORDER BY clause
order ORDER BY clause list order ORDER BY clause list
limit limit clause limit limit clause
handle_duplicates how to handle duplicates
RETURN RETURN
0 - OK 0 - OK
@ -294,8 +293,8 @@ int mysql_update(THD *thd,
List<Item> &values, List<Item> &values,
COND *conds, COND *conds,
uint order_num, ORDER *order, uint order_num, ORDER *order,
ha_rows limit, ha_rows limit,
enum enum_duplicates handle_duplicates, bool ignore, bool ignore,
ha_rows *found_return, ha_rows *updated_return) ha_rows *found_return, ha_rows *updated_return)
{ {
bool using_limit= limit != HA_POS_ERROR; bool using_limit= limit != HA_POS_ERROR;

3
sql/sql_update.h
View File

@ -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, int mysql_update(THD *thd,TABLE_LIST *tables,List<Item> &fields,
List<Item> &values,COND *conds, List<Item> &values,COND *conds,
uint order_num, ORDER *order, ha_rows limit, uint order_num, ORDER *order, ha_rows limit,
enum enum_duplicates handle_duplicates, bool ignore, bool ignore, ha_rows *found_return, ha_rows *updated_return);
ha_rows *found_return, ha_rows *updated_return);
bool mysql_multi_update(THD *thd, TABLE_LIST *table_list, bool mysql_multi_update(THD *thd, TABLE_LIST *table_list,
List<Item> *fields, List<Item> *values, List<Item> *fields, List<Item> *values,
COND *conds, ulonglong options, COND *conds, ulonglong options,