diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-04 10:56:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-04 10:56:47 +0300 |
| commit | 627027a6743672ce7b461971f772631d65f759f2 (patch) | |
| tree | bf88020d3c2615bf8f0dbf4291ae6a6ad6a8d196 /sql/sql_lex.cc | |
| parent | 1950e3246476ae6bee01290f31a3fb98427da73b (diff) | |
| parent | 5709a7777bd2c5c27b0f535099439f13c251de03 (diff) | |
| download | mariadb-git-627027a6743672ce7b461971f772631d65f759f2.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index caccf27446b..46995dc582d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -9132,9 +9132,8 @@ SELECT_LEX_UNIT *LEX::parsed_select_expr_cont(SELECT_LEX_UNIT *unit, enum sub_select_type unit_type, bool distinct, bool oracle) { - SELECT_LEX *sel1; - if (!s2->next_select()) - sel1= s2; + DBUG_ASSERT(!s2->next_select()); + SELECT_LEX *sel1= s2; SELECT_LEX *last= unit->pre_last_parse->next_select(); int cmp= oracle? 0 : cmp_unit_op(unit_type, last->get_linkage()); |