summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorpem@mysql.telia.com <>2003-10-16 15:45:27 +0200
committerpem@mysql.telia.com <>2003-10-16 15:45:27 +0200
commit1f1a8531d106c9d5c7a3c7990351186018fc20fa (patch)
tree92f8f5d804369e2ccfc4b68f39e6e361e97d8b75 /mysql-test
parentc258c86177263b3c8eed003b1f104ac4173b0288 (diff)
downloadmariadb-git-1f1a8531d106c9d5c7a3c7990351186018fc20fa.tar.gz
Handle user variables (@-vars) as OUT and INOUT parameters in SPs.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/sp.result16
-rw-r--r--mysql-test/t/sp.test20
2 files changed, 33 insertions, 3 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index cec4f7a9935..ab253112ab3 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -93,8 +93,12 @@ id data
zip 100
delete from t1;
drop procedure zip;
-drop procedure zap;
drop procedure bar;
+call zap(7, @zap);
+select @zap;
+@zap
+8
+drop procedure zap;
create procedure c1(x int)
call c2("c", x);
create procedure c2(s char(16), x int)
@@ -132,7 +136,17 @@ io1 1
delete from t1;
drop procedure iotest;
drop procedure inc2;
+create procedure incr(inout x int)
+call inc(x);
+select @zap;
+@zap
+8
+call incr(@zap);
+select @zap;
+@zap
+9
drop procedure inc;
+drop procedure incr;
create procedure cbv1()
begin
declare y int default 3;
diff --git a/mysql-test/t/sp.test b/mysql-test/t/sp.test
index 230a76721a4..91d4fd45d3f 100644
--- a/mysql-test/t/sp.test
+++ b/mysql-test/t/sp.test
@@ -122,9 +122,14 @@ call zip("zip", 99)|
select * from t1|
delete from t1|
drop procedure zip|
-drop procedure zap|
drop procedure bar|
+# Top-level OUT parameter
+call zap(7, @zap)|
+select @zap|
+
+drop procedure zap|
+
# "Deep" calls...
create procedure c1(x int)
@@ -165,8 +170,19 @@ select * from t1|
delete from t1|
drop procedure iotest|
drop procedure inc2|
-drop procedure inc|
+# Propagating top-level @-vars
+create procedure incr(inout x int)
+ call inc(x)|
+
+# Before
+select @zap|
+call incr(@zap)|
+# After
+select @zap|
+
+drop procedure inc|
+drop procedure incr|
# Call-by-value test
# The expected result is: