MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field

MariaDB · Aug 15, 2017 · 22c9663 · 22c9663
1 parent 6179a8e
commit 22c9663
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 2 deletions.
diff --git a/mysql-test/r/sp-row.result b/mysql-test/r/sp-row.result
@@ -2246,3 +2246,13 @@ b
 10
 DROP PROCEDURE p1;
 DROP TABLE t1;
+#
+# MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
+#
+BEGIN NOT ATOMIC
+DECLARE a ROW(a INT);
+EXPLAIN SELECT 1 INTO a.a;
+END;
+$$
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
diff --git a/mysql-test/suite/compat/oracle/r/sp-row.result b/mysql-test/suite/compat/oracle/r/sp-row.result
@@ -3070,3 +3070,14 @@ b
 10
 DROP PROCEDURE p1;
 DROP TABLE t1;
+#
+# MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
+#
+DECLARE
+a ROW(a INT);
+BEGIN
+EXPLAIN SELECT 1 INTO a.a;
+END;
+$$
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
diff --git a/mysql-test/suite/compat/oracle/t/sp-row.test b/mysql-test/suite/compat/oracle/t/sp-row.test
@@ -2375,3 +2375,16 @@ DELIMITER ;$$
 CALL p1;
 DROP PROCEDURE p1;
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
+--echo #
+
+DELIMITER $$;
+DECLARE
+  a ROW(a INT);
+BEGIN
+  EXPLAIN SELECT 1 INTO a.a;
+END;
+$$
+DELIMITER ;$$
diff --git a/mysql-test/t/sp-row.test b/mysql-test/t/sp-row.test
@@ -1471,3 +1471,16 @@ DELIMITER ;$$
 CALL p1;
 DROP PROCEDURE p1;
 DROP TABLE t1;
+
+
+--echo #
+--echo # MDEV-13527 Crash when EXPLAIN SELECT .. INTO row_sp_variable.field
+--echo #
+
+DELIMITER $$;
+BEGIN NOT ATOMIC
+  DECLARE a ROW(a INT);
+  EXPLAIN SELECT 1 INTO a.a;
+END;
+$$
+DELIMITER ;$$
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
@@ -12155,7 +12155,7 @@ select_outvar:
           }
         | ident '.' ident
           {
-            if (!($$= Lex->create_outvar(thd, &$1, &$3)))
+            if (!($$= Lex->create_outvar(thd, &$1, &$3)) && Lex->result)
               MYSQL_YYABORT;
           }
         ;

diff --git a/sql/sql_yacc_ora.yy b/sql/sql_yacc_ora.yy
@@ -12218,7 +12218,7 @@ select_outvar:
           }
         | ident '.' ident
           {
-            if (!($$= Lex->create_outvar(thd, &$1, &$3)))
+            if (!($$= Lex->create_outvar(thd, &$1, &$3)) && Lex->result)
               MYSQL_YYABORT;
           }
         ;