mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
711305e2c5
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. mysql-test/extra/rpl_tests/rpl_row_basic.test: Adding test cases for replicating UTF-8 fields of lengths of 256 or more (bytes). mysql-test/suite/binlog/r/binlog_base64_flag.result: Result file change. mysql-test/suite/binlog/t/binlog_base64_flag.test: Adding tests to trigger check that an error is generated when replicating from a 5.1.25 server for tables with a CHAR(128) but not when replicating a table with a CHAR(63). Although the bug indicates that the limit is 83, we elected to use CHAR(63) since 6.0 uses 4-byte UTF-8, and anything exceeding 63 would then cause the test to fail when the patch is merged to 6.0. mysql-test/suite/bugs/combinations: Adding combinations file to run all bug reports in all binlog modes (where applicable). mysql-test/suite/bugs/r/rpl_bug37426.result: Result file change. mysql-test/suite/bugs/t/rpl_bug37426.test: Added test for reported bug. mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result: Result file change. mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result: Result file change. sql/field.cc: Encoding an extra two bits in the most significant nibble (4 bits) of the metadata word. Adding assertions to ensure that no attempt is made to use lengths longer than supported. Extending compatible_field_size() function with an extra parameter holding a Relay_log_instace for error reporting. Field_string::compatible_field_size() now reports an error if field size for a CHAR is >255. sql/field.h: Field length is now computed from most significant 4 bits of metadata word, or is equal to the row pack length if there is no metadata. Extending compatible_field_size() function with an extra parameter holding a Relay_log_instace for error reporting. sql/rpl_utility.cc: Adding relay log parameter to compatible_field_size(). Minor refactoring to eliminate duplicate code. sql/slave.cc: Extending rpl_master_has_bug() with a single-argument predicate function and a parameter to the predicate function. The predicate function can be used to test for extra conditions for the bug before writing an error message. sql/slave.h: Extending rpl_master_has_bug() with a single-argument predicate function and a parameter to the predicate function. The predicate function can be used to test for extra conditions for the bug before writing an error message. Also removing gratuitous default argument. sql/sql_insert.cc: Changing calls to rpl_master_has_bug() to adapt to changed signature. |
||
|---|---|---|
| .. | ||
| binlog_auto_increment_bug33029-master.opt | ||
| binlog_auto_increment_bug33029.test | ||
| binlog_base64_flag.test | ||
| binlog_database.test | ||
| binlog_innodb.test | ||
| binlog_killed.test | ||
| binlog_killed_simulate-master.opt | ||
| binlog_killed_simulate.test | ||
| binlog_multi_engine.test | ||
| binlog_old_versions.test | ||
| binlog_row_binlog-master.opt | ||
| binlog_row_binlog.test | ||
| binlog_row_ctype_cp932.test | ||
| binlog_row_ctype_ucs.test | ||
| binlog_row_drop_tmp_tbl.test | ||
| binlog_row_innodb_stat-master.opt | ||
| binlog_row_innodb_stat.test | ||
| binlog_row_insert_select.test | ||
| binlog_row_mix_innodb_myisam-master.opt | ||
| binlog_row_mix_innodb_myisam.test | ||
| binlog_start_comment.test | ||
| binlog_statement_insert_delayed.test | ||
| binlog_stm_binlog-master.opt | ||
| binlog_stm_binlog.test | ||
| binlog_stm_blackhole.test | ||
| binlog_stm_ctype_cp932.test | ||
| binlog_stm_ctype_ucs.test | ||
| binlog_stm_drop_tmp_tbl.test | ||
| binlog_stm_innodb_stat-master.opt | ||
| binlog_stm_innodb_stat.test | ||
| binlog_stm_insert_select.test | ||
| binlog_stm_mix_innodb_myisam-master.opt | ||
| binlog_stm_mix_innodb_myisam.test | ||
| binlog_stm_ps.test | ||
| binlog_unsafe.test | ||
| disabled.def | ||