diff options
author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2008-03-25 17:48:05 -0600 |
---|---|---|
committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2008-03-25 17:48:05 -0600 |
commit | a1d5a59c2af6e031995add81c68e839b2213fa45 (patch) | |
tree | 7967576e138a87eb631e602fb9abb0165d3bf868 /mysql-test/r/sp-code.result | |
parent | ce047d4b8d20af49e1a3fa545bc8ae22ae35f4ed (diff) | |
download | mariadb-git-a1d5a59c2af6e031995add81c68e839b2213fa45.tar.gz |
Manual merge
mysql-test/r/sp-code.result:
manual merge, adjust test results
Diffstat (limited to 'mysql-test/r/sp-code.result')
-rw-r--r-- | mysql-test/r/sp-code.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result index 7706f18b171..39770dc4f2a 100644 --- a/mysql-test/r/sp-code.result +++ b/mysql-test/r/sp-code.result @@ -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; |