summaryrefslogtreecommitdiff
path: root/mysql-test/t/sp.test
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2008-11-12 19:51:47 +0200
committerAndrei Elkin <aelkin@mysql.com>2008-11-12 19:51:47 +0200
commitca2d1846950b07115a001a37d84ce63ab2acdc6c (patch)
treeda19273bb9e832fe232c5251aa3f4d9dc29ee7f0 /mysql-test/t/sp.test
parent162e550fcf986454cd1a542e98d8adc8fa81fd00 (diff)
parent1d521f6c20881997c9162bd11cadcbc77d20520b (diff)
downloadmariadb-git-ca2d1846950b07115a001a37d84ce63ab2acdc6c.tar.gz
merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
Diffstat (limited to 'mysql-test/t/sp.test')
-rw-r--r--mysql-test/t/sp.test40
1 files changed, 39 insertions, 1 deletions
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index a8727fbb1b7..d57fe777953 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -7997,8 +7997,24 @@ select (select func30787(f1)) as ttt from t1;
drop function func30787;
drop table t1;
-###########################################################################
+#
+# Bug #33811: Call to stored procedure with SELECT * / RIGHT JOIN fails
+# after the first time
+#
+CREATE TABLE t1 (id INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4);
+
+CREATE PROCEDURE test_sp()
+ SELECT t1.* FROM t1 RIGHT JOIN t1 t2 ON t1.id=t2.id;
+
+CALL test_sp();
+CALL test_sp();
+
+DROP PROCEDURE test_sp;
+DROP TABLE t1;
+
+###########################################################################
#
# Bug#38291 memory corruption and server crash with view/sp/function
#
@@ -8041,6 +8057,28 @@ delimiter ;$
call `p2`('s s s s s s');
drop procedure `p2`;
+#
+# Bug#38823: Invalid memory access when a SP statement does wildcard expansion
+#
+
+--disable_warnings
+drop table if exists t1;
+drop procedure if exists p1;
+--enable_warnings
+
+delimiter $;
+create procedure p1() begin select * from t1; end$
+--error ER_NO_SUCH_TABLE
+call p1$
+create table t1 (a integer)$
+call p1$
+alter table t1 add b integer;
+call p1$
+delimiter ;$
+
+drop table t1;
+drop procedure p1;
+
--echo # ------------------------------------------------------------------
--echo # -- End of 5.0 tests
--echo # ------------------------------------------------------------------