summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-06-09 16:50:58 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-06-09 16:50:58 +0300
commit65f1a42788549a18311cc631fcee582c1c67dc08 (patch)
treeccccf7564e0626895d46f55fc843d8eecb13c770 /sql/item_subselect.cc
parent29e8c154172bd6b9dccd9757fddace93be6ad194 (diff)
parentb25d2a457859b343e98b1a8c43613ad33eeff01d (diff)
downloadmariadb-git-65f1a42788549a18311cc631fcee582c1c67dc08.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index a87b4687915..c39fbf54f13 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -287,6 +287,8 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref)
res= TRUE;
goto end;
}
+ if (sl == unit->first_select() && !sl->next_select())
+ unit->fake_select_lex= 0;
}
}