From a1d5a59c2af6e031995add81c68e839b2213fa45 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Mar 2008 17:48:05 -0600 Subject: [PATCH] Manual merge mysql-test/r/sp-code.result: manual merge, adjust test results --- mysql-test/r/sp-code.result | 10 +++++----- 1 file 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;