From: Marc Alff
Date: March 22 2011 12:01pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3610)
List-Archive: http://lists.mysql.com/commits/133505
Message-Id: <201103221201.p2MC1OVO032102@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/malff/BZR_TREE/mysql-trunk-stage/ based on revid:marc.alff@stripped

 3610 Marc Alff	2011-03-22 [merge]
      Merge mysql-trunk (revno 3306) --> mysql-trunk-stage

    modified:
      mysql-test/collections/default.daily
      mysql-test/extra/rpl_tests/rpl_crash_safe.inc
      mysql-test/r/events_bugs.result
      mysql-test/suite/binlog/t/binlog_variables_relay_log.test
      mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/rpl/r/rpl_row_crash_safe.result
      mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
      mysql-test/suite/rpl/t/rpl_000017.test
      mysql-test/t/events_bugs.test
      mysql-test/t/flush2.test
      sql/event_db_repository.cc
=== modified file 'mysql-test/collections/default.daily'
--- a/mysql-test/collections/default.daily	2011-03-11 09:58:45 +0000
+++ b/mysql-test/collections/default.daily	2011-03-22 10:56:44 +0000
@@ -14,3 +14,5 @@ perl mysql-test-run.pl --force --timer -
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist                 --vardir=var-nist                --suite=nist
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=nist+ps              --vardir=var-ps_nist             --suite=nist                                        --ps-protocol
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_binlog_checksum  --vardir=var-rpl_binlog_checksum --suite=rpl,binlog --mysqld=--binlog-checksum=CRC32 --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_relay --vardir=var-rpl_crash_safe_relay --suite=rpl --mysqld=--relay-log-info-repository=TABLE --skip-test-list=collections/disabled-daily.list
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_crash_safe_master --vardir=var-rpl_crash_safe_master --suite=rpl --mysqld=--master-info-repository=TABLE --skip-test-list=collections/disabled-daily.list

=== modified file 'mysql-test/extra/rpl_tests/rpl_crash_safe.inc'
--- a/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2010-12-20 14:27:17 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_crash_safe.inc	2011-03-22 10:56:44 +0000
@@ -10,9 +10,11 @@
 if (`SELECT HEX(@commands) = HEX('configure')`)
 {
   --sync_slave_with_master
+  --source include/stop_slave.inc
   SHOW CREATE TABLE mysql.slave_relay_log_info;
   ALTER TABLE mysql.slave_relay_log_info ENGINE= Innodb;
   SHOW CREATE TABLE mysql.slave_relay_log_info;
+  --source include/start_slave.inc
 
   connection master;
   --source extra/rpl_tests/rpl_mixing_engines.inc

=== 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/suite/binlog/t/binlog_variables_relay_log.test'
--- a/mysql-test/suite/binlog/t/binlog_variables_relay_log.test	2010-11-04 14:43:52 +0000
+++ b/mysql-test/suite/binlog/t/binlog_variables_relay_log.test	2011-03-22 10:56:44 +0000
@@ -1,4 +1,5 @@
 --source include/not_embedded.inc
+--source include/not_relay_log_info_table.inc
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --query_vertical SHOW VARIABLES LIKE 'relay_log%'

=== modified file 'mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test'
--- a/mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test	2010-11-04 14:43:52 +0000
+++ b/mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test	2011-03-22 10:56:44 +0000
@@ -1,4 +1,5 @@
 --source include/not_embedded.inc
+--source include/not_relay_log_info_table.inc
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --query_vertical SHOW VARIABLES LIKE 'relay_log%'

=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2011-03-18 11:20:23 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2011-03-22 04:38:53 +0000
@@ -214,7 +214,7 @@ def	mysql	time_zone_transition_type	Time
 def	mysql	time_zone_transition_type	Transition_type_id	2	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned	PRI			
 def	mysql	user	Alter_priv	17	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	Alter_routine_priv	28	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
-def	mysql	user	authentication_string	42	NULL	NO	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				
+def	mysql	user	authentication_string	42	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				
 def	mysql	user	Create_priv	8	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	Create_routine_priv	27	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	Create_tablespace_priv	32	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
@@ -236,7 +236,7 @@ def	mysql	user	max_questions	37	0	NO	int
 def	mysql	user	max_updates	38	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned				
 def	mysql	user	max_user_connections	40	0	NO	int	NULL	NULL	10	0	NULL	NULL	int(11) unsigned				
 def	mysql	user	Password	3		NO	char	41	41	NULL	NULL	latin1	latin1_bin	char(41)				
-def	mysql	user	plugin	41		NO	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)				
+def	mysql	user	plugin	41		YES	char	64	192	NULL	NULL	utf8	utf8_bin	char(64)				
 def	mysql	user	Process_priv	12	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	References_priv	15	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				
 def	mysql	user	Reload_priv	10	N	NO	enum	1	3	NULL	NULL	utf8	utf8_general_ci	enum('N','Y')				

=== modified file 'mysql-test/suite/rpl/r/rpl_row_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_crash_safe.result	2011-03-22 10:56:44 +0000
@@ -10,6 +10,7 @@ call mtr.add_suppression(".*int __cxa_pu
 ###################################################################################
 SET @verbose= 'Y';
 SET @commands= 'configure';
+include/stop_slave.inc
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -35,6 +36,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL,
   PRIMARY KEY (`Master_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+include/start_slave.inc
 SET SQL_LOG_BIN=0;
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
 CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result	2011-03-22 10:56:44 +0000
@@ -10,6 +10,7 @@ call mtr.add_suppression(".*int __cxa_pu
 ###################################################################################
 SET @verbose= 'Y';
 SET @commands= 'configure';
+include/stop_slave.inc
 SHOW CREATE TABLE mysql.slave_relay_log_info;
 Table	Create Table
 slave_relay_log_info	CREATE TABLE `slave_relay_log_info` (
@@ -35,6 +36,7 @@ slave_relay_log_info	CREATE TABLE `slave
   `Sql_delay` int(11) NOT NULL,
   PRIMARY KEY (`Master_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Relay Log Information'
+include/start_slave.inc
 SET SQL_LOG_BIN=0;
 CREATE TABLE nt_1 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;
 CREATE TABLE nt_2 (trans_id INT, stmt_id INT, info VARCHAR(64), PRIMARY KEY(trans_id, stmt_id)) ENGINE = MyISAM;

=== modified file 'mysql-test/suite/rpl/t/rpl_000017.test'
--- a/mysql-test/suite/rpl/t/rpl_000017.test	2010-12-19 17:15:12 +0000
+++ b/mysql-test/suite/rpl/t/rpl_000017.test	2011-03-22 10:56:44 +0000
@@ -8,6 +8,7 @@
 # --skip-slave-start.
 
 --source include/not_windows.inc
+--source include/not_master_info_table.inc
 
 --let $rpl_skip_start_slave= 1
 --source include/master-slave.inc

=== 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 'mysql-test/t/flush2.test'
--- a/mysql-test/t/flush2.test	2010-11-17 08:49:58 +0000
+++ b/mysql-test/t/flush2.test	2011-03-22 10:56:44 +0000
@@ -3,6 +3,7 @@
 #
 
 --source include/not_embedded.inc
+--source include/not_relay_log_info_table.inc
 
 flush logs;
 set global expire_logs_days = 3;

=== 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: revision is a merge).