diff options
| author | unknown <serg@serg.mysql.com> | 2001-02-19 16:32:00 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2001-02-19 16:32:00 +0100 |
| commit | 8abb940e1673439da9ce99db2f37083788ad5eae (patch) | |
| tree | cd8f6e4da56dda2a3282a8715678be1a4e4fa7a5 /sql/sql_select.cc | |
| parent | 4621e6b4e21e74dffd205ed44041c0f386204580 (diff) | |
| parent | 52ad800794c75c6225ac4d6cb9ee75a29ea33f27 (diff) | |
| download | mariadb-git-8abb940e1673439da9ce99db2f37083788ad5eae.tar.gz | |
Merge
sql/sql_select.cc:
merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index af851733af9..db1d3b7d774 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -473,8 +473,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, (group && order) || test(select_options & OPTION_BUFFER_RESULT))); - make_join_readinfo(&join, - (select_options & SELECT_DESCRIBE) | SELECT_USE_CACHE); + make_join_readinfo(&join, (select_options & SELECT_DESCRIBE) | + (ftfuncs.elements ? 0 : SELECT_USE_CACHE)); // No cache for MATCH /* Need to tell Innobase that to play it safe, it should fetch all columns of the tables: this is because MySQL |