summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-20 13:30:05 +0200
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-12-20 13:30:05 +0200
commite3d89652e5fd314f03875a3d026490452b2a5986 (patch)
tree9f4d60e4431933ba6e53feb3372c9297c8b8836c /sql/item.cc
parent7bbc6c14d1e8fcf1f4737e0a5fcf6237fe18bd23 (diff)
parent042f763268c0f209e7c12e0a6a72bb5d204dfe29 (diff)
downloadmariadb-git-e3d89652e5fd314f03875a3d026490452b2a5986.tar.gz
Merge branch '10.0' into 10.1
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 8c64a10c496..97bd15b688e 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -4623,7 +4623,8 @@ resolve_ref_in_select_and_group(THD *thd, Item_ident *ref, SELECT_LEX *select)
if (thd->variables.sql_mode & MODE_ONLY_FULL_GROUP_BY &&
select->having_fix_field &&
- select_ref != not_found_item && !group_by_ref)
+ select_ref != not_found_item && !group_by_ref &&
+ !ref->alias_name_used)
{
/*
Report the error if fields was found only in the SELECT item list and