Commit 7d8e8032 authored by unknown's avatar unknown
Browse files

sql_update.cc: 

  After merge fix


sql/sql_update.cc:
  After merge fix
parent 70536ba1

sql/sql_update.cc

+1 −2
Original line number Diff line number Diff line
@@ -237,9 +237,8 @@ int mysql_update(THD *thd, 
  }

  // Don't count on usage of 'only index' when calculating which key to use

  table->used_keys.clear_all();

  select= make_select(table, 0, 0, conds, 0, &error);

  if (limit)

    select=make_select(table,0,0,conds,&error);

    select= make_select(table, 0, 0, conds, 0, &error);

  if (error || !limit ||

      (select && select->check_quick(thd, safe_update, limit)))

  {