diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 07:58:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 07:58:42 +0300 |
| commit | a0588d54a20488b17a178244989e1abc5151a88a (patch) | |
| tree | 7de7ef6bd7153479ee397006dd71eab7599b43f8 /sql/sql_lex.cc | |
| parent | 031f11717d9f351dfb12cd27c225c533e289261a (diff) | |
| parent | 75c01f39b1b4a6d27d36d075f8baab9bdda7cc7e (diff) | |
| download | mariadb-git-a0588d54a20488b17a178244989e1abc5151a88a.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 60b386f2cf4..c840ae6990c 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -9392,7 +9392,7 @@ SELECT_LEX *LEX::parsed_subselect(SELECT_LEX_UNIT *unit) (curr_sel == NULL && current_select == &builtin_select)); if (curr_sel) { - curr_sel->register_unit(unit, &curr_sel->context); + curr_sel->register_unit(unit, context_stack.head()); curr_sel->add_statistics(unit); } |