diff options
author | Mats Kindahl <mats@sun.com> | 2010-03-17 15:28:49 +0100 |
---|---|---|
committer | Mats Kindahl <mats@sun.com> | 2010-03-17 15:28:49 +0100 |
commit | 2c5f439d651f00f2f13d1f8e94f3701dadf9c7d3 (patch) | |
tree | 25da1cce3d83a72ee2d7bce4c40bddb413eb5c19 /sql/rpl_utility.cc | |
parent | 8799820faf2a10b6ed406bde7df885caf144548a (diff) | |
download | mariadb-git-2c5f439d651f00f2f13d1f8e94f3701dadf9c7d3.tar.gz |
BUG#49618: Field length stored incorrectly in binary log
for InnoDB
The class Field_bit_as_char stores the metadata for the
field incorrecly because bytes_in_rec and bit_len are set
to (field_length + 7 ) / 8 and 0 respectively, while
Field_bit has the correct values field_length / 8 and
field_length % 8.
Solved the problem by re-computing the values for the
metadata based on the field_length instead of using the
bytes_in_rec and bit_len variables.
To handle compatibility with old server, a table map
flag was added to indicate that the bit computation is
exact. If the flag is clear, the slave computes the
number of bytes required to store the bit field and
compares that instead, effectively allowing replication
*without conversion* from any field length that require
the same number of bytes to store.
mysql-test/suite/rpl/t/rpl_typeconv_innodb.test:
Adding test to check compatibility for bit field
replication when using InnoDB
sql/field.cc:
Extending compatible_field_size() with flags from
table map to allow fields to check master info.
sql/field.h:
Extending compatible_field_size() with flags from
table map to allow fields to check master info.
sql/log.cc:
Removing table map flags since they are not used
outside table map class.
sql/log_event.cc:
Removing flags parameter from table map constructor
since it is not used and does not have to be exposed.
sql/log_event.h:
Adding flag to denote that bit length for bit field type
is exact and not potentially rounded to even bytes.
sql/rpl_utility.cc:
Adding fields to table_def to store table map flags.
sql/rpl_utility.h:
Removing obsolete comment and adding flags to store
table map flags from master.
Diffstat (limited to 'sql/rpl_utility.cc')
-rw-r--r-- | sql/rpl_utility.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_utility.cc b/sql/rpl_utility.cc index e34f8561051..6058c473e9f 100644 --- a/sql/rpl_utility.cc +++ b/sql/rpl_utility.cc @@ -206,7 +206,7 @@ table_def::compatible_with(Relay_log_info const *rli_arg, TABLE *table) Check the slave's field size against that of the master. */ if (!error && - !field->compatible_field_size(field_metadata(col), rli_arg)) + !field->compatible_field_size(field_metadata(col), rli_arg, m_flags)) { error= 1; char buf[256]; |