summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-07 09:39:46 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-07 09:39:46 +0200
commit9e27e53dfac1c911a593065a0fcadc5729957d29 (patch)
tree679b56d887a1544264a9f872a2d8b3a7659cd8f2 /sql/item.cc
parentb7ae4d442aa32752798f1d3b6122c35c4ebe2d07 (diff)
parent9044e016c54762300beb2cd609b41c285bbf8794 (diff)
downloadmariadb-git-9e27e53dfac1c911a593065a0fcadc5729957d29.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 385016d51b0..535fb1328d2 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -6130,6 +6130,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
if (!thd->lex->current_select->no_wrap_view_item &&
thd->lex->in_sum_func &&
+ select &&
thd->lex == select->parent_lex &&
thd->lex->in_sum_func->nest_level ==
select->nest_level)