summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-06-08 15:02:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-06-08 15:02:40 +0300
commit72b248962136ccb08800d8267522549f0cdd4647 (patch)
tree1dbb0f39d6543b3b33cd395f9513140c6a6b0694 /sql/item_subselect.cc
parentbb28bffc3ed179a9912aced2b873e43999111887 (diff)
parent6e9642beb2cafecbcb96e591e1b4466b877d4885 (diff)
downloadmariadb-git-72b248962136ccb08800d8267522549f0cdd4647.tar.gz
Merge 10.3 into 10.4
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 4734a1aaebc..7a0c2b3a35c 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -281,6 +281,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;
}
}