bzr commit into mysql-6.0-rpl branch (mats:2801) Bug#32462

[Mats Kindahl]

#At file:///home/bzr/mkindahl/fixing-6.0-rpl/ based on revid:mats@stripped

 2801 Mats Kindahl	2009-01-28
      Bug #32462: Replication of CHAR(64) field with utf8 encoding crashes under RBR
      
      Enabling disabled test cases for this bug.
modified:
  mysql-test/suite/rpl/r/rpl_ignore_table.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_ignore_table.test

per-file messages:
  mysql-test/suite/rpl/t/disabled.def
    Enabling tests rpl_do_grant and rpl_ignore_table.
  mysql-test/suite/rpl/t/rpl_ignore_table.test
    Since the row-based replication is very strict about extra
    columns having defaults, values has to be provided for the
    BLOB NOT NULL fields ssl_cipher, x509_issuer, and x509_subject.
=== modified file 'mysql-test/suite/rpl/r/rpl_ignore_table.result'
--- a/mysql-test/suite/rpl/r/rpl_ignore_table.result	2008-11-13 19:19:00 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ignore_table.result	2009-01-28 20:34:23 +0000
@@ -29,11 +29,7 @@ to mysqltest3@localhost;
 create database mysqltest2;
 create table mysqltest2.t2 (id int);
 GRANT SELECT ON mysqltest2.t2 TO mysqltest4@localhost IDENTIFIED BY 'pass';
-insert into mysql.user (user, host) values ("mysqltest5", "somehost");
-Warnings:
-Warning	1364	Field 'ssl_cipher' doesn't have a default value
-Warning	1364	Field 'x509_issuer' doesn't have a default value
-Warning	1364	Field 'x509_subject' doesn't have a default value
+insert into mysql.user (user, host, ssl_cipher, x509_issuer, x509_subject) values ("mysqltest5", "somehost", '', '', '');
 GRANT SELECT ON *.* TO mysqltest6@localhost;
 GRANT INSERT ON *.* TO mysqltest6@localhost;
 GRANT INSERT ON test.* TO mysqltest6@localhost;

=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-01-27 16:40:12 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-01-28 20:34:23 +0000
@@ -10,8 +10,6 @@
 #
 ##############################################################################
 
-rpl_do_grant               : BUG#32462 2007-11-16 mats Crash when replicating 4-byte encoded UTF-8 fields
-rpl_ignore_table           : BUG#32462 2007-11-16 mats Crash when replicating 4-byte encoded UTF-8 fields
 rpl_view                   : Bug#32654: rpl_view.test fails randomly
 rpl_ndb_multi              : Bug#30751: rpl_ndb_multi missing row in output
 rpl_log_pos                : Bug#8693 Test 'rpl_log_pos' fails sometimes

=== modified file 'mysql-test/suite/rpl/t/rpl_ignore_table.test'
--- a/mysql-test/suite/rpl/t/rpl_ignore_table.test	2008-11-13 19:19:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_ignore_table.test	2009-01-28 20:34:23 +0000
@@ -63,8 +63,10 @@ create table mysqltest2.t2 (id int);
 # Create a grant that should replicate
 GRANT SELECT ON mysqltest2.t2 TO mysqltest4@localhost IDENTIFIED BY 'pass';
 
-# Create a grant manually
-insert into mysql.user (user, host) values ("mysqltest5", "somehost");
+# Create a grant manually. Note that BLOB NOT NULL columns does not
+# have default values, and not supplying values will cause the slave
+# to stop under row-based replication.
+insert into mysql.user (user, host, ssl_cipher, x509_issuer, x509_subject) values ("mysqltest5", "somehost", '', '', '');
 
 # Partial replicate 3 with *.*
 GRANT SELECT ON *.* TO mysqltest6@localhost;