diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-10-13 13:43:29 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-10-13 13:43:29 -0700 |
| commit | c7db46a2427e933a379d0a8c62221c344a29ea06 (patch) | |
| tree | 9b18bd0d93bea6517341827cfd02540054633174 /sql/item.cc | |
| parent | e37639e9349b56296d452e69e970df939383d7e1 (diff) | |
| parent | 78b580b77965d63d4292a72a3ba12d0cc83b01a3 (diff) | |
| download | mariadb-git-c7db46a2427e933a379d0a8c62221c344a29ea06.tar.gz | |
Merge 5.3-5.5
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item.cc b/sql/item.cc index 88e654d07b5..e94c4651ee3 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5109,6 +5109,11 @@ bool Item_field::fix_fields(THD *thd, Item **reference) goto mark_non_agg_field; } + if (thd->lex->in_sum_func && + thd->lex->in_sum_func->nest_level == + thd->lex->current_select->nest_level) + set_if_bigger(thd->lex->in_sum_func->max_arg_level, + thd->lex->current_select->nest_level); /* if it is not expression from merged VIEW we will set this field. @@ -5125,11 +5130,6 @@ bool Item_field::fix_fields(THD *thd, Item **reference) return FALSE; set_field(from_field); - if (thd->lex->in_sum_func && - thd->lex->in_sum_func->nest_level == - thd->lex->current_select->nest_level) - set_if_bigger(thd->lex->in_sum_func->max_arg_level, - thd->lex->current_select->nest_level); } else if (thd->mark_used_columns != MARK_COLUMNS_NONE) { |