diff options
| author | unknown <serg@serg.mysql.com> | 2000-12-20 12:51:00 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-12-20 12:51:00 +0100 |
| commit | d5ebd8f8b9361ef272e4a2d4632177c258803c63 (patch) | |
| tree | 6c239dfd41f88796b94ef71a52cd3afd60246d80 | |
| parent | 7fd7f86adea45a74485d60755ffda5a54015f4f3 (diff) | |
| download | mariadb-git-d5ebd8f8b9361ef272e4a2d4632177c258803c63.tar.gz | |
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
| -rw-r--r-- | sql/filesort.cc | 5 | ||||
| -rw-r--r-- | sql/sql_select.cc | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 189a8d3a33a..b0333762515 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -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 (;;) { diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1359551fcf1..fdd4541cfc8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -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_... |