bzr commit into mysql-6.0 branch (mats:2714)

[Mats Kindahl]

#At file:///home/bzr/fix-mysql-6.0-bugteam/

 2714 Mats Kindahl	2008-07-13
      Updating result files with mismatch caused by merge from 5.1.
modified:
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2008-07-09 13:25:06 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2008-07-13 06:30:40 +0000
@@ -488,7 +488,7 @@ Comparing tables master:test.t2 and slav
 INSERT INTO t3 VALUES (1, "", 1);
 INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
 Last_SQL_Error
-Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 512, test.t3 on slave has size 65. Master's column size should be <= the slave's column size.
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
 START SLAVE;
 [expecting slave to replicate correctly]
@@ -499,14 +499,14 @@ Comparing tables master:test.t4 and slav
 INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
-Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 1020, test.t5 on slave has size 65. Master's column size should be <= the slave's column size.
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
 START SLAVE;
 [expecting slave to stop]
 INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
-Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 1020, test.t6 on slave has size 513. Master's column size should be <= the slave's column size.
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
 START SLAVE;
 [expecting slave to replicate correctly]

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2008-07-09 13:25:06 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2008-07-13 06:30:40 +0000
@@ -488,7 +488,7 @@ Comparing tables master:test.t2 and slav
 INSERT INTO t3 VALUES (1, "", 1);
 INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
 Last_SQL_Error
-Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 512, test.t3 on slave has size 65. Master's column size should be <= the slave's column size.
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
 START SLAVE;
 [expecting slave to replicate correctly]
@@ -499,14 +499,14 @@ Comparing tables master:test.t4 and slav
 INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
-Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 1020, test.t5 on slave has size 65. Master's column size should be <= the slave's column size.
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
 START SLAVE;
 [expecting slave to stop]
 INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
 Last_SQL_Error
-Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
+Table definition on master and slave does not match: Column 1 size mismatch - master has size 1020, test.t6 on slave has size 513. Master's column size should be <= the slave's column size.
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=8;
 START SLAVE;
 [expecting slave to replicate correctly]