diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 17:46:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 17:46:17 +0200 |
| commit | ed1f52a20662ed07117cc65a0f9cdaf699856a74 (patch) | |
| tree | c51ee8bae9e0e8c87d0c98b3db7a9f71ed2fd3ea /sql/sql_parse.cc | |
| parent | 5511c21b41680a8c75f07a002a7362be7d157380 (diff) | |
| parent | 182faa3c06dd54e0364e6f43b4d5d938f94c1743 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-25121.tar.gz | |
WIP merge 10.3 to 10.4bb-10.4-MDEV-25121
FIXME: review main.brackets result change
FIXME: Failing main.subselect* tests
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index dad7b804e7e..2f0e0a94aea 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8987,6 +8987,8 @@ push_new_name_resolution_context(THD *thd, left_op->first_leaf_for_name_resolution(); on_context->last_name_resolution_table= right_op->last_leaf_for_name_resolution(); + on_context->select_lex = thd->lex->current_select; + on_context->outer_context = thd->lex->current_context()->outer_context; return thd->lex->push_context(on_context); } |