revision-id: 0219e8e4132b48d3932c9273be5c497d85e6b01d (mariadb-10.4.3-54-g0219e8e4132) parent(s): 3b2e6076b274455ffcf06fefda569a5d92762fc2 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-03-11 17:35:02 +0100 message: c --- sql/sql_lex.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 7f2499d4dff..89b330f263a 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -8841,11 +8841,8 @@ void st_select_lex_unit::reset_distinct() void st_select_lex_unit::fix_distinct() { - if (union_distinct) - { - if (this != union_distinct->master_unit()) - reset_distinct(); - } + if (union_distinct && this != union_distinct->master_unit()) + reset_distinct(); }