bk commit into 5.1 tree (lars:1.2322)

[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@stripped, 2006-09-16 13:20:06+02:00, lars@stripped +3 -0
  Test case fixes

  mysql-test/r/rpl_row_tabledefs_2myisam.result@stripped, 2006-09-16 13:20:02+02:00,
lars@stripped +4 -4
    Change error code of new error

  mysql-test/r/rpl_switch_stm_row_mixed.result@stripped, 2006-09-16 13:20:02+02:00,
lars@stripped +1 -1
    Change of result file

  mysql-test/t/mysqldump.test@stripped, 2006-09-16 13:20:02+02:00, lars@stripped +0 -1
    incorrect merge

# 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-rpl

--- 1.14/mysql-test/r/rpl_switch_stm_row_mixed.result	2006-09-16 13:20:31 +02:00
+++ 1.15/mysql-test/r/rpl_switch_stm_row_mixed.result	2006-09-16 13:20:31 +02:00
@@ -750,7 +750,7 @@ master-bin.000001	#	Query	1	#	use `mysql
 master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t2)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE TABLE `t3` (
-  `1` varbinary(108) NOT NULL DEFAULT ''
+  `1` varbinary(36) NOT NULL DEFAULT ''
 )
 master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t3)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

--- 1.4/mysql-test/r/rpl_row_tabledefs_2myisam.result	2006-09-16 13:20:31 +02:00
+++ 1.5/mysql-test/r/rpl_row_tabledefs_2myisam.result	2006-09-16 13:20:31 +02:00
@@ -151,7 +151,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1514
+Last_Errno	1522
 Last_Error	Table width mismatch - received 2 columns, test.t2 has 1 columns
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -189,7 +189,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1514
+Last_Errno	1522
 Last_Error	Column 0 type mismatch - received type 3, test.t4 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -227,7 +227,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1514
+Last_Errno	1522
 Last_Error	Column 1 type mismatch - received type 3, test.t5 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#
@@ -265,7 +265,7 @@ Replicate_Do_Table	
 Replicate_Ignore_Table	
 Replicate_Wild_Do_Table	
 Replicate_Wild_Ignore_Table	
-Last_Errno	1514
+Last_Errno	1522
 Last_Error	Column 2 type mismatch - received type 3, test.t6 has type 4
 Skip_Counter	0
 Exec_Master_Log_Pos	#

--- 1.120/mysql-test/t/mysqldump.test	2006-09-16 13:20:31 +02:00
+++ 1.121/mysql-test/t/mysqldump.test	2006-09-16 13:20:31 +02:00
@@ -835,7 +835,6 @@ use test;
 --echo # Dump of view
 --echo #
 
->>>>>>>
 create table t1(a int);
 create view v1 as select * from t1;
 --exec $MYSQL_DUMP --skip-comments test