Merge branch 'mdev-18844' of https://github.com/waynexia/server into mdev-18844bb-mdev-18844

1 files changed, 3 insertions, 2 deletions

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 1abc81bcdff..a7d0d08feb2 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);