From: Date: June 25 2009 3:09pm
Subject: bzr commit into mysql-5.4 branch (alik:2810) Bug#21422 Bug#45716
List-Archive: http://lists.mysql.com/commits/77196
X-Bug: 21422,45716
Message-Id: <20090625130956.C3FA67FC65@quad>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_ASu6K4LcIWbCPdfP3rYRcQ)"

--Boundary_(ID_ASu6K4LcIWbCPdfP3rYRcQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

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

 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
=== 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/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();


--Boundary_(ID_ASu6K4LcIWbCPdfP3rYRcQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/alik@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/alik@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: alik@stripped
# target_branch: file:///mnt/raid/alik/MySQL/bzr/disabled/azalea-bf-\
#   disabled_tests/
# testament_sha1: 1885c0df7e9290c9ddc79dbabda69fad97bde8bb
# timestamp: 2009-06-25 17:09:56 +0400
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--Boundary_(ID_ASu6K4LcIWbCPdfP3rYRcQ)--