From: Mayank Prasad
Date: March 28 2011 3:57pm
Subject: [Resend] bzr commit into mysql-trunk branch (mayank.prasad:3338) Bug#11751148
List-Archive: http://lists.mysql.com/commits/134089
X-Bug: 11751148
Message-Id: <201103281557.p2SFvrHC022147@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

[This commit e-mail is a repeat.]

#At file:///home/mayank/mysql-tree/mysql-trunk/ based on revid:sergey.glukhov@stripped

 3338 Mayank Prasad	2011-03-28 [merge]
      merge from 5.5 for bug#11751148

    modified:
      mysql-test/r/events_bugs.result
      mysql-test/t/events_bugs.test
=== modified file 'mysql-test/r/events_bugs.result'
--- a/mysql-test/r/events_bugs.result	2011-03-21 16:09:40 +0000
+++ b/mysql-test/r/events_bugs.result	2011-03-28 15:38:16 +0000
@@ -747,15 +747,15 @@ event_name	originator
 ev1	4294967295
 DROP EVENT ev1;
 SET GLOBAL server_id = @old_server_id;
+CREATE DATABASE event_test12;
+USE event_test12;
+CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
 CREATE DATABASE event_test1;
 USE event_test1;
-CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-CREATE DATABASE event_test2;
-USE event_test2;
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 DROP DATABASE event_test1;
-DROP DATABASE event_test2;
+DROP DATABASE event_test12;
 DROP DATABASE events_test;
 SET GLOBAL event_scheduler= 'ON';
 SET @@global.concurrent_insert= @concurrent_insert;

=== modified file 'mysql-test/t/events_bugs.test'
--- a/mysql-test/t/events_bugs.test	2011-03-21 16:09:40 +0000
+++ b/mysql-test/t/events_bugs.test	2011-03-28 15:38:16 +0000
@@ -1225,15 +1225,15 @@ SET GLOBAL server_id = @old_server_id;
 # Bug#11751148: show events shows events in other schema
 #
 
+CREATE DATABASE event_test12;
+USE event_test12;
+CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
 CREATE DATABASE event_test1;
 USE event_test1;
-CREATE EVENT ev1 ON SCHEDULE EVERY 1 DAY DO SELECT 1;
-CREATE DATABASE event_test2;
-USE event_test2;
 # Following show events should not show ev1
 SHOW EVENTS;
 DROP DATABASE event_test1;
-DROP DATABASE event_test2;
+DROP DATABASE event_test12;
 
 
 ###########################################################################

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).