From: Date: June 30 2008 10:53pm
Subject: bzr push into mysql-5.1 branch (joerg:2662 to 2663) Bug#37426
List-Archive: http://lists.mysql.com/commits/48765
X-Bug: 37426
Message-Id: <20080630205316.D1B513B3C2@trift-lap.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2663 Joerg Bruehe	2008-06-30
      Version 5.1.26 is labeled "rc".
modified:
  configure.in

 2662 Mats Kindahl	2008-06-30
       BUG#37426: RBR breaks for CHAR() UTF-8 fields > 85 chars
            
      In order to handle CHAR() fields, 8 bits were reserved for
      the size of the CHAR field. However, instead of denoting the
      number of characters in the field, field_length was used which
      denotes the number of bytes in the field.
      
      Since UTF-8 fields can have three bytes per character (and
      has been extended to have four bytes per character in 6.0),
      an extra two bits have been encoded in the field metadata
      work for fields of type Field_string (i.e., CHAR fields).
      
      Since the metadata word is filled, the extra bits have been
      encoded in the upper 4 bits of the real type (the most 
      significant byte of the metadata word) by computing the
      bitwise xor of the extra two bits. Since the upper 4 bits
      of the real type always is 1111 for Field_string, this 
      means that for fields of length <256, the encoding is
      identical to the encoding used in pre-5.1.26 servers, but
      for lengths of 256 or more, an unrecognized type is formed,
      causing an old slave (that does not handle lengths of 256
      or more) to stop.
added:
  mysql-test/suite/bugs/combinations
  mysql-test/suite/bugs/r/rpl_bug37426.result
  mysql-test/suite/bugs/t/rpl_bug37426.test
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/suite/binlog/r/binlog_base64_flag.result
  mysql-test/suite/binlog/t/binlog_base64_flag.test
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
  sql/field.cc
  sql/field.h
  sql/rpl_utility.cc
  sql/slave.cc
  sql/slave.h
  sql/sql_insert.cc

=== modified file 'configure.in'
--- a/configure.in	2008-06-20 13:00:11 +0000
+++ b/configure.in	2008-06-30 20:52:26 +0000
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.26)
+AM_INIT_AUTOMAKE(mysql, 5.1.26-rc)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10