From f23b41b9b8a30e0e54a1ec7a8923057b0e57e0f5 Mon Sep 17 00:00:00 2001
From: Sergei Petrunia <psergey@askmonty.org>
Date: Fri, 16 Dec 2016 17:16:02 +0300
Subject: MDEV-10148: Database crashes in the query to the View

Fix st_select_lex::is_merged_child_of to work across merged views or
derived tables.
---
 mysql-test/r/subselect2.result | 35 +++++++++++++++++++++++++++++++++++
 mysql-test/t/subselect2.test   | 37 +++++++++++++++++++++++++++++++++++++
 sql/sql_lex.cc                 |  6 ++++++
 3 files changed, 78 insertions(+)

diff --git a/mysql-test/r/subselect2.result b/mysql-test/r/subselect2.result
index 72ca9d33354..b6dc940d9fb 100644
--- a/mysql-test/r/subselect2.result
+++ b/mysql-test/r/subselect2.result
@@ -348,4 +348,39 @@ where t1.a = t2.a and ( t1.a = ( select min(a) from t1 ) or 0 );
 a	a	a
 FRA	FRA	FRA
 drop table t1,t2,t3;
+#
+# MDEV-10148: Database crashes in the query to the View
+#
+CREATE TABLE t1 (
+key_code INT(11) NOT NULL,
+value_string VARCHAR(50) NULL DEFAULT NULL,
+PRIMARY KEY (key_code)
+) COLLATE='utf8_general_ci' ENGINE=InnoDB ;
+CREATE TABLE t2 (
+key_code INT(11) NOT NULL,
+target_date DATE NULL DEFAULT NULL,
+PRIMARY KEY (key_code)
+) COLLATE='utf8_general_ci' ENGINE=InnoDB ;
+CREATE TABLE t3 (
+now_date DATE NOT NULL,
+PRIMARY KEY (now_date)
+) COLLATE='utf8_general_ci' ENGINE=InnoDB ;
+CREATE VIEW v1
+AS
+SELECT
+B.key_code,
+B.target_date
+FROM
+t2 B INNER JOIN t3 C ON
+B.target_date = C.now_date
+;
+SET @s = 'SELECT A.* FROM t1 A WHERE A.key_code IN (SELECT key_code FROM v1)';
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+key_code	value_string
+EXECUTE stmt;
+key_code	value_string
+DEALLOCATE PREPARE stmt;
+DROP VIEW v1;
+DROP TABLE t1,t2,t3;
 set optimizer_switch=@subselect2_test_tmp;
diff --git a/mysql-test/t/subselect2.test b/mysql-test/t/subselect2.test
index b3c1322184d..f795cef648c 100644
--- a/mysql-test/t/subselect2.test
+++ b/mysql-test/t/subselect2.test
@@ -359,5 +359,42 @@ where t1.a = t2.a and ( t1.a = ( select min(a) from t1 ) or 0 );
 
 drop table t1,t2,t3;
 
+--echo #
+--echo # MDEV-10148: Database crashes in the query to the View
+--echo #
+CREATE TABLE t1 (
+	key_code INT(11) NOT NULL,
+	value_string VARCHAR(50) NULL DEFAULT NULL,
+	PRIMARY KEY (key_code)
+) COLLATE='utf8_general_ci' ENGINE=InnoDB ;
+ 
+CREATE TABLE t2 (
+	key_code INT(11) NOT NULL,
+	target_date DATE NULL DEFAULT NULL,
+	PRIMARY KEY (key_code)
+) COLLATE='utf8_general_ci' ENGINE=InnoDB ;
+ 
+CREATE TABLE t3 (
+	now_date DATE NOT NULL,
+	PRIMARY KEY (now_date)
+) COLLATE='utf8_general_ci' ENGINE=InnoDB ;
+ 
+CREATE VIEW v1
+AS
+SELECT
+	B.key_code,
+	B.target_date
+FROM
+	t2 B INNER JOIN t3 C ON
+	B.target_date = C.now_date
+;
+SET @s = 'SELECT A.* FROM t1 A WHERE A.key_code IN (SELECT key_code FROM v1)';
+PREPARE stmt FROM @s;
+EXECUTE stmt;                                   #1st time -> success
+EXECUTE stmt;                                   #2nd time -> crash
+DEALLOCATE PREPARE stmt;
+DROP VIEW v1;
+DROP TABLE t1,t2,t3;
+
 set optimizer_switch=@subselect2_test_tmp;
 
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index f2e7b4f7c3a..fa866bc7008 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -4247,6 +4247,12 @@ bool st_select_lex::is_merged_child_of(st_select_lex *ancestor)
     {
       continue;
     }
+
+    if (sl->master_unit()->derived &&
+      sl->master_unit()->derived->is_merged_derived())
+    {
+      continue;
+    }
     all_merged= FALSE;
     break;
   }
-- 
cgit v1.2.1