From: Mayank Prasad Date: March 21 2011 4:02pm Subject: bzr commit into mysql-5.1 branch (mayank.prasad:3622) Bug#11751148 List-Archive: http://lists.mysql.com/commits/133429 X-Bug: 11751148 Message-Id: <201103211603.p2LG325W024504@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0325646583==" --===============0325646583== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/mayank/mysql-server/mysql-11751148/ based on revid:ramil@stripped 3622 Mayank Prasad 2011-03-21 Bug #11751148 : show events shows events in other schema Issue: ------ Due to prefix match, database like 'k' was matching with 'ka' and events of 'ka' we getting displayed for 'show event' of 'k'. Resolution: ----------- Scan for listing of events in a schema is made to be done on exact match of database (schema) name instead of just prefix. @ mysql-test/r/events_bugs.result modified expected file with the expected results. @ mysql-test/t/events_bugs.test added a test case to reproduce the scenario. @ sql/event_db_repository.cc Scan for schema name is made to be done on exact db name match. modified: mysql-test/r/events_bugs.result mysql-test/t/events_bugs.test sql/event_db_repository.cc === modified file 'mysql-test/r/events_bugs.result' --- a/mysql-test/r/events_bugs.result 2009-03-11 20:30:56 +0000 +++ b/mysql-test/r/events_bugs.result 2011-03-21 16:02:47 +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-03-11 20:30:56 +0000 +++ b/mysql-test/t/events_bugs.test 2011-03-21 16:02:47 +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 2010-01-22 09:38:21 +0000 +++ b/sql/event_db_repository.cc 2011-03-21 16:02:47 +0000 @@ -424,7 +424,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->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 --===============0325646583== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mayank.prasad@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mayank.prasad@stripped\ # blla8r4c2f38w45d # target_branch: file:///home/mayank/mysql-server/mysql-11751148/ # testament_sha1: b344208cf9ba1878e6ae6362ea81ec3cbaaae51d # timestamp: 2011-03-21 21:32:52 +0530 # base_revision_id: ramil@stripped # # Begin bundle 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 --===============0325646583==--