revision-id: c9fe6fbb61428e2d40f1de085ebdae505935b362 (mariadb-10.4.4-289-gc9fe6fb) parent(s): 2707af2dec65ffd4195b9d79a233b1f298fe1756 author: Igor Babaev committer: Igor Babaev timestamp: 2019-08-31 22:44:58 -0700 message: Merge branch 'mdev-18844' of https://github.com/waynexia/server into mdev-18844 --- sql/sql_union.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 1abc81b..a7d0d08 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -858,7 +858,7 @@ bool select_unit_ext::send_eof() } if (curr_op_type == INTERSECT_ALL) { - longlong add_cnt= additional_cnt->val_int(); + ha_rows add_cnt= (ha_rows)additional_cnt->val_int(); if (dup_cnt > add_cnt && add_cnt > 0) dup_cnt= (ha_rows)add_cnt; } @@ -2171,7 +2171,8 @@ bool st_select_lex_unit::exec() sl->tvc->exec(sl); else sl->join->exec(); - if (sl == union_distinct && !have_except_all_or_intersect_all) + if (sl == union_distinct && !have_except_all_or_intersect_all && + !(with_element && with_element->is_recursive)) { // This is UNION DISTINCT, so there should be a fake_select_lex DBUG_ASSERT(fake_select_lex != NULL);