Skip to content

Commit

Permalink
MDEV-22462: Item_in_subselect::create_single_in_to_exists_cond(JOIN *…
Browse files Browse the repository at this point in the history
…, Item **, Item **): Assertion `false' failed.

Item_in_subselect::create_single_in_to_exists_cond() should handle the
case where the subquery is a table-less select but it is not a result
of a UNION.

(Table-less subqueries like "(SELECT 1)" are "substituted" with their select
list, but table-less subqueries with WHERE or HAVING clause, like
"(SELECT 1 WHERE ...)" are not substituted. They are handled with regular
execution path)
  • Loading branch information
spetrunia committed May 21, 2021
1 parent 8c8a6ed commit 2087d47
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 25 deletions.
11 changes: 10 additions & 1 deletion mysql-test/r/subselect4.result
Original file line number Diff line number Diff line change
Expand Up @@ -2721,7 +2721,15 @@ id select_type table type possible_keys key key_len ref rows Extra
SELECT a FROM t1 WHERE (a, a) IN (SELECT 1, 2) AND a = (SELECT MIN(b) FROM t2);
a
DROP TABLE t1,t2;
# End of 10.2 tests
#
# MDEV-22462: Item_in_subselect::create_single_in_to_exists_cond(JOIN *, Item **, Item **): Assertion `false' failed.
#
select 1 from dual where 1 in (select 5 from dual where 1);
1
create table t1 (a int);
insert into t1 values (1),(2),(3);
update t1 set a = 2 where a in (select a from dual where a = a);
drop table t1;
#
# MDEV-24925: Server crashes in Item_subselect::init_expr_cache_tracker
#
Expand Down Expand Up @@ -2793,3 +2801,4 @@ FROM (t1 JOIN t1 AS ref_t1 ON
(t1.i1 > (SELECT ref_t1.i1 AS c0 FROM t1 b ORDER BY -c0)));
ERROR 21000: Subquery returns more than 1 row
DROP TABLE t1;
# End of 10.2 tests
13 changes: 12 additions & 1 deletion mysql-test/t/subselect4.test
Original file line number Diff line number Diff line change
Expand Up @@ -2236,7 +2236,17 @@ SELECT a FROM t1 WHERE (a, a) IN (SELECT 1, 2) AND a = (SELECT MIN(b) FROM t2);

DROP TABLE t1,t2;

--echo # End of 10.2 tests
--echo #
--echo # MDEV-22462: Item_in_subselect::create_single_in_to_exists_cond(JOIN *, Item **, Item **): Assertion `false' failed.
--echo #

select 1 from dual where 1 in (select 5 from dual where 1);

create table t1 (a int);
insert into t1 values (1),(2),(3);

update t1 set a = 2 where a in (select a from dual where a = a);
drop table t1;

--echo #
--echo # MDEV-24925: Server crashes in Item_subselect::init_expr_cache_tracker
Expand Down Expand Up @@ -2296,3 +2306,4 @@ FROM (t1 JOIN t1 AS ref_t1 ON

DROP TABLE t1;

--echo # End of 10.2 tests
44 changes: 21 additions & 23 deletions sql/item_subselect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2249,7 +2249,8 @@ Item_in_subselect::create_single_in_to_exists_cond(JOIN *join,
*/
Item *item= (Item*) select_lex->item_list.head();

if (select_lex->table_list.elements)
if (select_lex->table_list.elements ||
!(select_lex->master_unit()->is_union()))
{
Item *having= item;
Item *orig_item= item;
Expand Down Expand Up @@ -2297,31 +2298,28 @@ Item_in_subselect::create_single_in_to_exists_cond(JOIN *join,
}
else
{
if (select_lex->master_unit()->is_union())
DBUG_ASSERT(select_lex->master_unit()->is_union());

Item *new_having=
func->create(thd, expr,
new (thd->mem_root) Item_ref_null_helper(thd,
&select_lex->context,
this,
&select_lex->ref_pointer_array[0],
(char *)"<no matter>",
(char *)"<result>"));
if (!abort_on_null && left_expr->maybe_null)
{
Item *new_having=
func->create(thd, expr,
new (thd->mem_root) Item_ref_null_helper(thd,
&select_lex->context,
this,
&select_lex->ref_pointer_array[0],
(char *)"<no matter>",
(char *)"<result>"));
if (!abort_on_null && left_expr->maybe_null)
{
disable_cond_guard_for_const_null_left_expr(0);
if (!(new_having= new (thd->mem_root) Item_func_trig_cond(thd, new_having,
get_cond_guard(0))))
DBUG_RETURN(true);
}

new_having->name= (char*) in_having_cond;
if (fix_having(new_having, select_lex))
disable_cond_guard_for_const_null_left_expr(0);
if (!(new_having= new (thd->mem_root) Item_func_trig_cond(thd, new_having,
get_cond_guard(0))))
DBUG_RETURN(true);
*having_item= new_having;
}
else
DBUG_ASSERT(false);

new_having->name= (char*) in_having_cond;
if (fix_having(new_having, select_lex))
DBUG_RETURN(true);
*having_item= new_having;
}
}

Expand Down

0 comments on commit 2087d47

Please sign in to comment.