bzr commit into mysql-5.4 branch (alik:2809) Bug#45708

[Alexander Nozdrin]

#At file:///mnt/raid/alik/MySQL/bzr/disabled/azalea-bf-disabled_tests/ based on revid:alik@strippedom-20090625123312-u8czfqs81y2xi3zp

 2809 Alexander Nozdrin	2009-06-25
      Fix Bug#45708.
      
      Enable test cases for Bug#6063 and Bug#7088.

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
=== modified file 'mysql-test/r/sp.result'
--- a/mysql-test/r/sp.result	2009-06-17 07:30:19 +0000
+++ b/mysql-test/r/sp.result	2009-06-25 13:00:13 +0000
@@ -3319,9 +3319,43 @@ call bug11529()|
 call bug11529()|
 delete from t1|
 drop procedure bug11529|
+set character set utf8|
 drop procedure if exists bug6063|
 drop procedure if exists bug7088_1|
 drop procedure if exists bug7088_2|
+create procedure bug6063()
+begin
+lâbel: begin end;
+label: begin end;
+label1: begin end;
+end|
+create procedure bug7088_1()
+label1: begin end label1|
+create procedure bug7088_2()
+läbel1: begin end|
+call bug6063()|
+call bug7088_1()|
+call bug7088_2()|
+set character set default|
+show create procedure bug6063|
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+bug6063		CREATE DEFINER=`root`@`localhost` PROCEDURE `bug6063`()
+begin
+l�l: begin end;
+label: begin end;
+label1: begin end;
+end	utf8	latin1_swedish_ci	latin1_swedish_ci
+show create procedure bug7088_1|
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+bug7088_1		CREATE DEFINER=`root`@`localhost` PROCEDURE `bug7088_1`()
+label1: begin end label1	utf8	latin1_swedish_ci	latin1_swedish_ci
+show create procedure bug7088_2|
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
+bug7088_2		CREATE DEFINER=`root`@`localhost` PROCEDURE `bug7088_2`()
+l�l1: begin end	utf8	latin1_swedish_ci	latin1_swedish_ci
+drop procedure bug6063|
+drop procedure bug7088_1|
+drop procedure bug7088_2|
 drop procedure if exists bug9565_sub|
 drop procedure if exists bug9565|
 create procedure bug9565_sub()

=== modified file 'mysql-test/t/sp.test'
--- a/mysql-test/t/sp.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/t/sp.test	2009-06-25 13:00:13 +0000
@@ -4064,35 +4064,41 @@ drop procedure bug11529|
 # BUG#6063: Stored procedure labels are subject to restrictions (partial)
 # BUG#7088: Stored procedures: labels won't work if character set is utf8
 #
+
+set character set utf8|
+
 --disable_warnings
 drop procedure if exists bug6063|
 drop procedure if exists bug7088_1|
 drop procedure if exists bug7088_2|
 --enable_warnings
 
-# -- [DISABLED Bug#45708]
---disable_parsing # temporarily disabled until Bar fixes BUG#11986
 create procedure bug6063()
-  lâbel: begin end|
-call bug6063()|
-# QQ Known bug: this will not show the label correctly.
-show create procedure bug6063|
+begin
+  lâbel: begin end;
+  label: begin end;
+  label1: begin end;
+end|
 
-set character set utf8|
 create procedure bug7088_1()
   label1: begin end label1|
+
 create procedure bug7088_2()
   läbel1: begin end|
+
+call bug6063()|
 call bug7088_1()|
 call bug7088_2()|
+
 set character set default|
+
+show create procedure bug6063|
 show create procedure bug7088_1|
 show create procedure bug7088_2|
 
 drop procedure bug6063|
 drop procedure bug7088_1|
 drop procedure bug7088_2|
---enable_parsing
 
 #
 # BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure

Attachment: [text/bzr-bundle] bzr/[e-mail]