Commit 630a23ba authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/psergey/mysql-5.0-bug12082


sql/sql_select.cc:
  Auto merged
parents cfb8abd6 7a62b592

sql/sql_select.cc

+7 −6
Original line number Diff line number Diff line
@@ -9745,7 +9745,13 @@ join_read_const_table(JOIN_TAB *tab, POSITION *pos) 
      table->file->extra(HA_EXTRA_KEYREAD);

      tab->index= tab->ref.key;

    }

    if ((error=join_read_const(tab)))

    error=join_read_const(tab);

    if (table->key_read)

    {

      table->key_read=0;

      table->file->extra(HA_EXTRA_NO_KEYREAD);

    }

    if (error)

    {

      tab->info="unique row not found";

      /* Mark for EXPLAIN that the row was not found */
@@ -9753,11 +9759,6 @@ join_read_const_table(JOIN_TAB *tab, POSITION *pos) 
      if (!table->maybe_null || error > 0)

	DBUG_RETURN(error);

    }

    if (table->key_read)

    {

      table->key_read=0;

      table->file->extra(HA_EXTRA_NO_KEYREAD);

    }

  }

  if (*tab->on_expr_ref && !table->null_row)

  {