Commit 94b9b751 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

sql_select.cc Disables quick_select for JT_FT 

filesort.cc	Temporary fix for FULLTEXT index removed
parent 4656daa6

sql/filesort.cc

+0 −5
Original line number Diff line number Diff line
@@ -325,11 +325,6 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, 
    file->rnd_init();

    file->extra(HA_EXTRA_CACHE);	/* Quicker reads */

  }

  else if (quick_select)		// QQ For FULLTEXT

  {					// QQ Should be removed soon

    file->index_end();	

    select->quick->init();

  }



  for (;;)

  {

sql/sql_select.cc

+2 −2
Original line number Diff line number Diff line
@@ -2247,8 +2247,8 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond) 
	{

	  /* Use quick key read if it's a constant and it's not used

	     with key reading */

	  if (tab->needed_reg == 0 && tab->type != JT_EQ_REF &&

	      (tab->type != JT_REF ||

	  if (tab->needed_reg == 0 && tab->type != JT_EQ_REF

	      && tab->type != JT_FT && (tab->type != JT_REF ||

	       (uint) tab->ref.key == tab->quick->index))

	  {

	    sel->quick=tab->quick;		// Use value from get_quick_...