Commit c5f9e201 authored by unknown's avatar unknown
Browse files

Post-merge fixes

parent 8698ffc9

sql/opt_range.cc

+1 −1
Original line number Diff line number Diff line
@@ -1401,7 +1401,7 @@ uint get_index_for_order(TABLE *table, ORDER *order, ha_rows limit) 
    if (!ord->asc)

      return MAX_KEY;



  for (idx= 0; idx < table->keys; idx++)

  for (idx= 0; idx < table->s->keys; idx++)

  {

    if (!(table->keys_in_use_for_query.is_set(idx)))

      continue;

sql/sql_delete.cc

+1 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, 
    {

      delete select;

      free_underlaid_joins(thd, &thd->lex->select_lex);

      DBUG_RETURN(-1);			// This will force out message

      DBUG_RETURN(TRUE);

    }

    

    if (!select && limit != HA_POS_ERROR)
@@ -166,7 +166,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, 
      {

        delete select;

        free_underlaid_joins(thd, &thd->lex->select_lex);

        DBUG_RETURN(-1);			// This will force out message

      }

      /*

        Filesort has already found and selected the rows we want to delete,
@@ -175,7 +174,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, 
      delete select;

      free_underlaid_joins(thd, select_lex);

      select= 0;

      DBUG_RETURN(TRUE);

    }

  }