10.0-base merge

1 files changed, 25 insertions, 0 deletions

diff --git a/mysql-test/t/subselect4.test b/mysql-test/t/subselect4.test
index b9fb052e42b..a114af6a66b 100644
--- a/mysql-test/t/subselect4.test
+++ b/mysql-test/t/subselect4.test
@@ -1826,6 +1826,31 @@ drop table t1,t2;
 set @@optimizer_switch = @optimizer_switch_MDEV4056;
 
 --echo #
+--echo # MDEV-5103: server crashed on singular Item_equal
+--echo #
+
+CREATE TABLE t1 (
+  a enum('p','r') NOT NULL DEFAULT 'r',
+  b int NOT NULL DEFAULT '0',
+  c char(32) NOT NULL,
+  d varchar(255) NOT NULL,
+  PRIMARY KEY (a, b), UNIQUE KEY idx(a, c)
+);
+INSERT INTO t1 VALUES ('r', 1, 'ad18832202b199728921807033a8a515', '001_cbr643');
+
+CREATE TABLE t2 (
+  a enum('p','r') NOT NULL DEFAULT 'r',
+  b int NOT NULL DEFAULT '0',
+  e datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (a, b, e)
+);
+INSERT INTO t2 VALUES ('r', 1, '2013-10-05 14:25:30');
+
+SELECT * FROM t1 AS t 
+  WHERE a='r' AND (c,b) NOT IN (SELECT c,b FROM t2 WHERE (c,b)=(t.c,t.b));
+
+DROP TABLE t1, t2;
+--echo #
 --echo # MDEV-3899  Valgrind warnings (blocks are definitely lost) in filesort on IN subquery with SUM and DISTINCT
 --echo #