summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/hfmain.(none) <>2007-05-18 20:02:27 +0500
committerholyfoot/hf@mysql.com/hfmain.(none) <>2007-05-18 20:02:27 +0500
commit8b21517de4312c114c071affc41d811cfdc0332e (patch)
tree0dedf8bbe03f29d6bb8dd4cdf3452a45c38a575e /sql/item.cc
parentc90682326e6ca83428b209d19652ed8699a0bdb9 (diff)
parent835189cb85531606c06d67c98e488325f37f7d94 (diff)
downloadmariadb-git-8b21517de4312c114c071affc41d811cfdc0332e.tar.gz
Merge bk@192.168.21.1:mysql-5.0
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 74cf180e619..651ab826484 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3503,7 +3503,8 @@ Item_field::fix_outer_field(THD *thd, Field **from_field, Item **reference)
prev_subselect_item->const_item_cache= 0;
set_field(*from_field);
if (!last_checked_context->select_lex->having_fix_field &&
- select->group_list.elements)
+ select->group_list.elements &&
+ (place == SELECT_LIST || place == IN_HAVING))
{
Item_outer_ref *rf;
/*