summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2010-07-09 14:46:46 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2010-07-09 14:46:46 +0400
commit024dba64b64f395151f6b95650e8ee69a1591428 (patch)
tree1d80637254b45550c8fcffe6c715050b6c1c4a0b /sql/sql_select.cc
parent0d80d45a6dce3c9c4169895c009b141a07e8e907 (diff)
parent013136364c95b7bcc5a987dd301b042f31dab1f9 (diff)
downloadmariadb-git-024dba64b64f395151f6b95650e8ee69a1591428.tar.gz
5.1-bugteam->trunk-merge merge
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 8860cafc55f..d3db6bd89c3 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1154,7 +1154,7 @@ JOIN::optimize()
elements may be lost during further having
condition transformation in JOIN::exec.
*/
- if (having && const_table_map)
+ if (having && const_table_map && !having->with_sum_func)
{
having->update_used_tables();
having= remove_eq_conds(thd, having, &having_value);