diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-11-12 20:13:08 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-11-12 20:13:08 +0300 |
| commit | b31c544eec7e66bf64b45d1ae3b11e11ed537142 (patch) | |
| tree | 3ba3e080874526ae932e210a46f90846e2683731 /sql | |
| parent | 4519d5e4f1ce1c9081f711d88d7508f58453d219 (diff) | |
| parent | fb2e17903fe51094a083e4eceabd9857c6090ce8 (diff) | |
| download | mariadb-git-b31c544eec7e66bf64b45d1ae3b11e11ed537142.tar.gz | |
Automerge.
Diffstat (limited to 'sql')
| -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 768bbc3478d..df7c5af3ebc 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1229,7 +1229,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, |