bk commit into 5.1 tree (lars:1.2160)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2160 06/03/10 15:47:57 lars@stripped +4 -0
  Test fixes

  mysql-test/t/disabled.def
    1.97 06/03/10 15:47:48 lars@stripped +1 -0
    Disabled test case

  mysql-test/r/rpl_switch_stm_row_mixed.result
    1.4 06/03/10 15:47:48 lars@stripped +3 -3
    Updated result file

  mysql-test/r/rpl_row_charset.result
    1.4 06/03/10 15:47:48 lars@stripped +0 -10
    Updated result file

  mysql-test/r/binlog_row_drop_tmp_tbl.result
    1.2 06/03/10 15:47:48 lars@stripped +2 -0
    Updated result file

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145k.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new-wl3023-mats

--- 1.3/mysql-test/r/rpl_switch_stm_row_mixed.result	2006-03-09 15:59:14 +01:00
+++ 1.4/mysql-test/r/rpl_switch_stm_row_mixed.result	2006-03-10 15:47:48 +01:00
@@ -190,13 +190,13 @@
 master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 select @'string'
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 select "yesterday"
-master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo()
+master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo()
 begin
 insert into t1 values("work");
 insert into t1 values(concat("for",UUID()));
 insert into t1 select "yesterday";
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; create procedure foo2()
+master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo2()
 begin
 insert into t1 values(concat("emergency",UUID()));
 insert into t1 values("work");
@@ -205,7 +205,7 @@
 insert into t1 values("more work");
 set session binlog_format=mixed;
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; create function foo3() returns bigint unsigned
+master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function foo3() returns bigint unsigned
 begin
 set session binlog_format=row; # rejected for stored funcs
 insert into t1 values("alarm");

--- 1.96/mysql-test/t/disabled.def	2006-03-10 10:21:32 +01:00
+++ 1.97/mysql-test/t/disabled.def	2006-03-10 15:47:48 +01:00
@@ -43,3 +43,4 @@
 rpl_until               : Unstable test case, bug#15886
 sp-goto                 : GOTO is currently is disabled - will be fixed in the future
 rpl_rbr_to_sbr          : BUG#18108
+mysqldump               : BUG#18078

--- 1.1/mysql-test/r/binlog_row_drop_tmp_tbl.result	2005-12-22 06:34:51 +01:00
+++ 1.2/mysql-test/r/binlog_row_drop_tmp_tbl.result	2006-03-10 15:47:48 +01:00
@@ -14,5 +14,7 @@
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	create database `drop-temp+table-test`
 drop database `drop-temp+table-test`;

--- 1.3/mysql-test/r/rpl_row_charset.result	2006-02-24 16:19:47 +01:00
+++ 1.4/mysql-test/r/rpl_row_charset.result	2006-03-10 15:47:48 +01:00
@@ -114,20 +114,14 @@
 master-bin.000001	#	Query	1	#	drop database if exists mysqltest2
 master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	drop database if exists mysqltest3
 master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	create database mysqltest2 character set latin2
 master-bin.000001	#	Query	1	#	create database mysqltest3
 master-bin.000001	#	Query	1	#	drop database mysqltest3
 master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	create database mysqltest3
 master-bin.000001	#	Query	1	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))
 master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest2.t1)
@@ -155,12 +149,8 @@
 master-bin.000001	#	Query	1	#	drop database mysqltest2
 master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	drop database mysqltest3
 master-bin.000001	#	Table_map	1	#	table_id: # (mysql.proc)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.event)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 select "--- --global--" as "";