Commit f8d0d4d9 authored by malff@lambda.hsd1.co.comcast.net.'s avatar malff@lambda.hsd1.co.comcast.net.
Browse files

Manual merge

parent 56f893cc

mysql-test/r/sp-code.result

+5 −5
Original line number Diff line number Diff line
@@ -847,8 +847,8 @@ 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"

0	stmt 31 "SET @a=@a+1"

1	stmt 31 "SET  @b=@b+1"

set @a=1;

set @b=1;

call p_20906_a();
@@ -858,9 +858,9 @@ select @a, @b; 
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"

0	stmt 31 "SET @a=@a+1"

1	stmt 31 "SET  @b=@b+1"

2	stmt 31 "SET  @c=@c+1"

set @a=1;

set @b=1;

set @c=1;