From: Mayank Prasad
Date: March 21 2011 4:52pm
Subject: bzr push into mysql-trunk branch (mayank.prasad:3303 to 3304) Bug#11751148
List-Archive: http://lists.mysql.com/commits/133437
X-Bug: 11751148
Message-Id: <201103211653.p2LGr4vf016753@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3304 Mayank Prasad	2011-03-21 [merge]
      merge from 5.5 to trunk for bug#11751148

    modified:
      mysql-test/r/events_bugs.result
      mysql-test/t/events_bugs.test
      sql/event_db_repository.cc
 3303 Georgi Kodinov	2011-03-21 [merge]
      null-merge mysql-5.5->mysql-trunk

=== modified file 'mysql-test/r/events_bugs.result'
--- a/mysql-test/r/events_bugs.result	2010-08-09 08:32:50 +0000
+++ b/mysql-test/r/events_bugs.result	2011-03-21 16:09:40 +0000
@@ -747,6 +747,15 @@ event_name	originator
 ev1	4294967295
 DROP EVENT ev1;
 SET GLOBAL server_id = @old_server_id;
+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 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	2009-12-22 09:35:56 +0000
+++ b/mysql-test/t/events_bugs.test	2011-03-21 16:09:40 +0000
@@ -1221,6 +1221,21 @@ SELECT event_name, originator FROM INFOR
 DROP EVENT ev1;
 SET GLOBAL server_id = @old_server_id;
 
+#
+# Bug#11751148: show events shows events in other schema
+#
+
+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;
+
+
 ###########################################################################
 #
 # End of tests

=== modified file 'sql/event_db_repository.cc'
--- a/sql/event_db_repository.cc	2011-03-09 20:54:55 +0000
+++ b/sql/event_db_repository.cc	2011-03-21 16:24:30 +0000
@@ -434,7 +434,7 @@ Event_db_repository::index_read_for_db_f
   key_copy(key_buf, event_table->record[0], key_info, key_len);
   if (!(ret= event_table->file->ha_index_read_map(event_table->record[0], key_buf,
                                                   (key_part_map)1,
-                                                  HA_READ_PREFIX)))
+                                                  HA_READ_KEY_EXACT)))
   {
     DBUG_PRINT("info",("Found rows. Let's retrieve them. ret=%d", ret));
     do

No bundle (reason: useless for push emails).