Commit 3f819973 authored by unknown's avatar unknown
Browse files

After merge fix 


sql/sql_update.cc:
  Add missing join method
parent 9b07cafe

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -3307,7 +3307,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, 
        0)

    {

      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),

	       table->real_name);

	       table->s->table_name);

      map->set_all();

      return 1;

    }

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 −0
Original line number Diff line number Diff line
@@ -3994,6 +3994,7 @@ select_options: 
              YYABORT;

	    }

          }

	  ;



select_option_list:

	select_option_list select_option