1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

sql_select.cc Disables quick_select for JT_FT

filesort.cc	Temporary fix for FULLTEXT index removed


sql/filesort.cc:
  Temporary fix for FULLTEXT index removed
sql/sql_select.cc:
  Disables quick_select for JT_FT
This commit is contained in:
unknown
2000-12-20 12:51:00 +01:00
parent 27336dfe8f
commit 9622ae146a
2 changed files with 2 additions and 7 deletions

View File

@ -325,11 +325,6 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select,
file->rnd_init(); file->rnd_init();
file->extra(HA_EXTRA_CACHE); /* Quicker reads */ 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 (;;) for (;;)
{ {

View File

@ -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 /* Use quick key read if it's a constant and it's not used
with key reading */ with key reading */
if (tab->needed_reg == 0 && tab->type != JT_EQ_REF && if (tab->needed_reg == 0 && tab->type != JT_EQ_REF
(tab->type != JT_REF || && tab->type != JT_FT && (tab->type != JT_REF ||
(uint) tab->ref.key == tab->quick->index)) (uint) tab->ref.key == tab->quick->index))
{ {
sel->quick=tab->quick; // Use value from get_quick_... sel->quick=tab->quick; // Use value from get_quick_...