database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-opt

Browse Source 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-opt-merge


mysql-test/r/sp-code.result:
  Auto merged
mysql-test/t/sp-code.test:
  Auto merged
This commit is contained in:
unknown
2008-03-25 17:35:34 -06:00
parent f1bb7c2019 18801aa829
commit ce047d4b8d
2 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mysql-test/r/sp-code.result
View File

@ -842,6 +842,34 @@ Pos Instruction
21 jump 3 21 jump 3
drop procedure proc_33618_h; drop procedure proc_33618_h;
drop procedure proc_33618_c; drop procedure proc_33618_c;
drop procedure if exists p_20906_a;
drop procedure if exists p_20906_b;
create procedure p_20906_a() SET @a=@a+1, @b=@b+1;
show procedure code p_20906_a;
Pos Instruction
0 stmt 32 "SET @a=@a+1"
1 stmt 32 "SET @b=@b+1"
set @a=1;
set @b=1;
call p_20906_a();
select @a, @b;
@a @b
2 2
create procedure p_20906_b() SET @a=@a+1, @b=@b+1, @c=@c+1;
show procedure code p_20906_b;
Pos Instruction
0 stmt 32 "SET @a=@a+1"
1 stmt 32 "SET @b=@b+1"
2 stmt 32 "SET @c=@c+1"
set @a=1;
set @b=1;
set @c=1;
call p_20906_b();
select @a, @b, @c;
@a @b @c
2 2 2
drop procedure p_20906_a;
drop procedure p_20906_b;
End of 5.0 tests. End of 5.0 tests.
CREATE PROCEDURE p1() CREATE PROCEDURE p1()
BEGIN BEGIN

32
mysql-test/t/sp-code.test
View File

@ -598,6 +598,38 @@ show procedure code proc_33618_c;
drop procedure proc_33618_h; drop procedure proc_33618_h;
drop procedure proc_33618_c; drop procedure proc_33618_c;
#
# Bug#20906 (Multiple assignments in SET in stored routine produce incorrect
# instructions)
#
--disable_warnings
drop procedure if exists p_20906_a;
drop procedure if exists p_20906_b;
--enable_warnings
create procedure p_20906_a() SET @a=@a+1, @b=@b+1;
show procedure code p_20906_a;
set @a=1;
set @b=1;
call p_20906_a();
select @a, @b;
create procedure p_20906_b() SET @a=@a+1, @b=@b+1, @c=@c+1;
show procedure code p_20906_b;
set @a=1;
set @b=1;
set @c=1;
call p_20906_b();
select @a, @b, @c;
drop procedure p_20906_a;
drop procedure p_20906_b;
--echo End of 5.0 tests. --echo End of 5.0 tests.
# #