Commit 59993e03 authored by unknown's avatar unknown
Browse files

Merge 


sql/sql_base.cc:
  Auto merged
parents 92834915 3f819973

sql/sql_update.cc

+1 −0
Original line number Diff line number Diff line
@@ -1099,6 +1099,7 @@ static bool safe_update_on_fly(JOIN_TAB *join_tab, List<Item> *fields) 
  case JT_EQ_REF:

    return TRUE;				// At most one matching row

  case JT_REF:

  case JT_REF_OR_NULL:

    return !check_if_key_used(table, join_tab->ref.key, *fields);

  case JT_ALL:

    /* If range search on index */

sql/sql_yacc.yy

+1 −1

File changed.

Contains only whitespace changes.