Skip to content

MDEV-35913 Assertion `m_comparator.cmp_type() != ROW_RESULT' in Item_… #4126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 11.8
Choose a base branch
from
Open

MDEV-35913 Assertion `m_comparator.cmp_type() != ROW_RESULT' in Item_… #4126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions mysql-test/main/type_row.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,17 @@ SET sql_mode=DEFAULT;
#
# End of 10.7 tests
#
#
# Start of 11.8 tests
#
CREATE TABLE t1 (a TEXT UNIQUE);
INSERT INTO t1 VALUES('1');
SELECT 1 FROM t1 WHERE ROW(a, (a,a)) IN ((1, (1,1)),(2, (2,1)));
1
1
DROP TABLE t1;
CREATE TABLE t1 (a INT KEY,b INT,vb DATE AS (b) VIRTUAL,KEY(vb));
SELECT * FROM t1 WHERE b<7 AND (a,b) NOT IN ((1,2),(8,9),(5,1));
a b vb
DROP TABLE t1;
# End of 11.8 tests
14 changes: 14 additions & 0 deletions mysql-test/main/type_row.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,17 @@ SET sql_mode=DEFAULT;
--echo #
--echo # End of 10.7 tests
--echo #

--echo #
--echo # Start of 11.8 tests
--echo #
CREATE TABLE t1 (a TEXT UNIQUE);
INSERT INTO t1 VALUES('1');
SELECT 1 FROM t1 WHERE ROW(a, (a,a)) IN ((1, (1,1)),(2, (2,1)));
DROP TABLE t1;

CREATE TABLE t1 (a INT KEY,b INT,vb DATE AS (b) VIRTUAL,KEY(vb));
SELECT * FROM t1 WHERE b<7 AND (a,b) NOT IN ((1,2),(8,9),(5,1));
DROP TABLE t1;

--echo # End of 11.8 tests
13 changes: 8 additions & 5 deletions sql/opt_vcol_substitution.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,14 +454,17 @@ Item* Item_func_null_predicate::vcol_subst_transformer(THD *thd, uchar *arg)
Item* Item_func_in::vcol_subst_transformer(THD *thd, uchar *arg)
{
Vcol_subst_context *ctx= (Vcol_subst_context*)arg;
Field *vcol_field= nullptr;

/* Check that all arguments inside IN() are constants */
if (!compatible_types_scalar_bisection_possible())
/*
Check that the left hand side of IN() is a virtual column expression and
that all arguments inside IN() are constants.
*/
if (!(vcol_field= is_vcol_expr(ctx, args[0])) ||
!compatible_types_scalar_bisection_possible())
return this;

Field *vcol_field;
if ((vcol_field= is_vcol_expr(ctx, args[0])))
subst_vcol_if_compatible(ctx, this, &args[0], vcol_field);
subst_vcol_if_compatible(ctx, this, &args[0], vcol_field);
return this;
}