database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Igor Babaev
2019-08-31 22:44:58 -07:00
parent 2707af2dec
commit c9fe6fbb61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_union.cc
View File

@ -858,7 +858,7 @@ bool select_unit_ext::send_eof()
} }
if (curr_op_type == INTERSECT_ALL) 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) if (dup_cnt > add_cnt && add_cnt > 0)
dup_cnt= (ha_rows)add_cnt; dup_cnt= (ha_rows)add_cnt;
} }
@ -2171,7 +2171,8 @@ bool st_select_lex_unit::exec()
sl->tvc->exec(sl); sl->tvc->exec(sl);
else else
sl->join->exec(); 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 // This is UNION DISTINCT, so there should be a fake_select_lex
DBUG_ASSERT(fake_select_lex != NULL); DBUG_ASSERT(fake_select_lex != NULL);