bzr push into mysql-5.4 branch (alik:2808 to 2810) Bug#21422 Bug#45716

[Alexander Nozdrin]

 2810 Alexander Nozdrin	2009-06-25
      Fix for Bug#45716: enable a test case for Bug#21422.

    modified:
      mysql-test/r/ps.result
      mysql-test/t/ps.test
 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
 2808 Alexander Nozdrin	2009-06-25
      Disabled failing RPL tests on Windows.

    modified:
      mysql-test/include/master-slave.inc
      mysql-test/suite/rpl/t/rpl_extraCol_innodb.test
      mysql-test/suite/rpl/t/rpl_extraCol_myisam.test
=== modified file 'mysql-test/r/ps.result'
--- a/mysql-test/r/ps.result	2009-05-29 08:09:00 +0000
+++ b/mysql-test/r/ps.result	2009-06-25 13:09:51 +0000
@@ -2728,13 +2728,28 @@ Table	Op	Msg_type	Msg_text
 test.t2	preload_keys	status	OK
 deallocate prepare abc;
 drop table t1, t2;
+create procedure proc_1() grant all on *.* to abc@host;
+drop procedure proc_1;
+create function func_1() returns int
+begin grant all on *.* to abc@host; return 1; end|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+prepare abc from "grant all on *.* to abc@host";
+create procedure proc_1() revoke all on *.* from abc@host;
+drop procedure proc_1;
+create function func_1() returns int
+begin revoke all on *.* from abc@host; return 1; end|
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+prepare abc from "revoke all on *.* from abc@host";
 create procedure proc_1() show errors;
 call proc_1();
 Level	Code	Message
+Error	1422	Explicit or implicit commit is not allowed in stored function or trigger.
 call proc_1();
 Level	Code	Message
+Error	1422	Explicit or implicit commit is not allowed in stored function or trigger.
 call proc_1();
 Level	Code	Message
+Error	1422	Explicit or implicit commit is not allowed in stored function or trigger.
 drop procedure proc_1;
 create function func_1() returns int begin show errors; return 1; end|
 ERROR 0A000: Not allowed to return a result set from a function

=== 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/ps.test'
--- a/mysql-test/t/ps.test	2009-06-24 19:39:33 +0000
+++ b/mysql-test/t/ps.test	2009-06-25 13:09:51 +0000
@@ -2795,25 +2795,34 @@ execute abc;
 deallocate prepare abc;
 drop table t1, t2;
 
-# -- [DISABLED Bug#45716]
-# Bug #21422: GRANT/REVOKE possible inside stored function, probably in a trigger
-# This is disabled for now till it is resolved in 5.0
-#
-
-#create procedure proc_1() grant all on *.* to abc@host;
-#drop procedure proc_1;
-#delimiter |;
-#--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-#create function func_1() returns int begin grant all on *.* to abc@host; return 1; end|
-#delimiter ;|
-#prepare abc from "grant all on *.* to abc@host";
-#
-#create procedure proc_1() revoke all on *.* from abc@host;
-#drop procedure proc_1;
-#delimiter |;#--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
-#create function func_1() returns int begin revoke all on *.* from abc@host; return 1; end|
-#delimiter ;|
-#prepare abc from "revoke all on *.* from abc@host";
+# Bug #21422: GRANT/REVOKE possible inside stored function, probably in a
+# trigger.
+
+create procedure proc_1() grant all on *.* to abc@host;
+drop procedure proc_1;
+
+delimiter |;
+
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+create function func_1() returns int
+  begin grant all on *.* to abc@host; return 1; end|
+
+delimiter ;|
+
+prepare abc from "grant all on *.* to abc@host";
+
+create procedure proc_1() revoke all on *.* from abc@host;
+drop procedure proc_1;
+
+delimiter |;
+
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+create function func_1() returns int
+  begin revoke all on *.* from abc@host; return 1; end|
+
+delimiter ;|
+
+prepare abc from "revoke all on *.* from abc@host";
 
 create procedure proc_1() show errors;
 call proc_1();

=== 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]