Fixed wrong merge
Optimize new pushed code sql/item_func.cc: Fixed wrong merge sql/sql_update.cc: Optimize new pushed code (There is no reason to add extra test for not common error case if code can handle it anyway)
This commit is contained in:
parent
256d286174
commit
a73b682af9
@ -1378,7 +1378,6 @@ my_decimal *Item_func_abs::decimal_op(my_decimal *decimal_value)
|
||||
void Item_func_abs::fix_length_and_dec()
|
||||
{
|
||||
Item_func_num1::fix_length_and_dec();
|
||||
maybe_null= 1;
|
||||
}
|
||||
|
||||
|
||||
|
@ -121,7 +121,7 @@ int mysql_update(THD *thd,
|
||||
bool safe_update= thd->options & OPTION_SAFE_UPDATES;
|
||||
bool used_key_is_modified, transactional_table;
|
||||
int res;
|
||||
int error=0;
|
||||
int error;
|
||||
uint used_index= MAX_KEY;
|
||||
bool need_sort= TRUE;
|
||||
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
||||
@ -132,7 +132,7 @@ int mysql_update(THD *thd,
|
||||
ha_rows updated, found;
|
||||
key_map old_used_keys;
|
||||
TABLE *table;
|
||||
SQL_SELECT *select= 0;
|
||||
SQL_SELECT *select;
|
||||
READ_RECORD info;
|
||||
SELECT_LEX *select_lex= &thd->lex->select_lex;
|
||||
bool need_reopen;
|
||||
@ -237,8 +237,7 @@ int mysql_update(THD *thd,
|
||||
}
|
||||
// Don't count on usage of 'only index' when calculating which key to use
|
||||
table->used_keys.clear_all();
|
||||
if (limit)
|
||||
select= make_select(table, 0, 0, conds, 0, &error);
|
||||
select= make_select(table, 0, 0, conds, 0, &error);
|
||||
if (error || !limit ||
|
||||
(select && select->check_quick(thd, safe_update, limit)))
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user