summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2018-09-03 10:57:02 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2018-09-03 10:57:02 +0200
commitb9bc3c24630980b260b91fc856689dbad336064e (patch)
tree63c6339feb795a0419540f6c63c41ff58a0ffd2d /mysql-test/r/sp.result
parentb3c320bb0b93e516cda4db277cfa3efeef48c988 (diff)
parent43c393ff4732e9ea8719864abeb73cefd5b528a9 (diff)
downloadmariadb-git-b9bc3c24630980b260b91fc856689dbad336064e.tar.gz
Merge branch '5.5' into 10.0bb-10.0-merge-sanja
Diffstat (limited to 'mysql-test/r/sp.result')
-rw-r--r--mysql-test/r/sp.result17
1 files changed, 17 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index 2cb1b701e2d..058ef69c548 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -7898,6 +7898,23 @@ SET S.CLOSE_YN = ''
where 1=1;
drop function if exists f1;
drop table t1,t2;
+#
+# MDEV-16957: Server crashes in Field_iterator_natural_join::next
+# upon 2nd execution of SP
+#
+CREATE TABLE t1 (a INT, b VARCHAR(32));
+CREATE PROCEDURE sp() SELECT * FROM t1 AS t1x JOIN t1 AS t1y USING (c);
+CALL sp;
+ERROR 42S22: Unknown column 'c' in 'from clause'
+CALL sp;
+ERROR 42S22: Unknown column 'c' in 'from clause'
+CALL sp;
+ERROR 42S22: Unknown column 'c' in 'from clause'
+alter table t1 add column c int;
+CALL sp;
+c a b a b
+DROP PROCEDURE sp;
+DROP TABLE t1;
# End of 5.5 test
#
# MDEV-7040: Crash in field_conv, memcpy_field_possible, part#2