diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-11-12 20:14:07 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-11-12 20:14:07 +0300 |
| commit | cf872354a8b20daced728a9c76c4d25648f88da8 (patch) | |
| tree | 58d6e76cd009f4ee255e80a1e220b13ff94df560 /sql/sql_select.cc | |
| parent | 552965eff927dff2f0248169e5c0510ef3783ccf (diff) | |
| parent | b31c544eec7e66bf64b45d1ae3b11e11ed537142 (diff) | |
| download | mariadb-git-cf872354a8b20daced728a9c76c4d25648f88da8.tar.gz | |
Automerge.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index d22e56a4f61..7a4ab1c8365 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1301,7 +1301,7 @@ JOIN::optimize() ((select_distinct || !simple_order || !simple_group) || (group_list && order) || test(select_options & OPTION_BUFFER_RESULT))) || - rollup.state != ROLLUP::STATE_NONE && select_distinct); + (rollup.state != ROLLUP::STATE_NONE && select_distinct)); // No cache for MATCH make_join_readinfo(this, |