summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@sun.com>2010-01-21 17:20:24 +0000
committerLuis Soares <luis.soares@sun.com>2010-01-21 17:20:24 +0000
commit73f10f0662ce40b5cc6e8bc4d04f6cee45768ae7 (patch)
tree3597ed3eef2a70d2e7de4980cbd95909097dbdbc /sql/field.h
parentd1d16f9c3f4310f3ab11fc85b47866d79243a471 (diff)
downloadmariadb-git-73f10f0662ce40b5cc6e8bc4d04f6cee45768ae7.tar.gz
BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete:
cant find record Some engines return data for the record. Despite the fact that the null bit is set for some fields, their old value may still in the row. This can happen when unpacking an AI from the binlog on top of a previous record in which a field is set to NULL, which previously contained a value. Ultimately, this may cause the comparison of records to fail when the slave is doing an index or range scan. We fix this by deploying a call to reset() for each field that is set to null while unpacking a row from the binary log. Furthermore, we also add mixed mode test case to cover the scenario where updating and setting a field to null through a Query event and later searching it through a rows event will succeed. Finally, we also change the reset() method, from Field_bit class, so that it takes into account bits stored among the null bits and not only the ones stored in the record. mysql-test/suite/rpl/t/rpl_set_null_innodb.test: InnoDB test. mysql-test/suite/rpl/t/rpl_set_null_myisam.test: MyISAM test. mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test: NDB test. sql/field.h: Changed reset so that it also clears the bits among the null_bits for the Field_bit class. sql/rpl_record.cc: Resetting field after setting it to null when unpacking row.
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index ae074cc1a30..55604193687 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1926,7 +1926,12 @@ public:
uint32 max_display_length() { return field_length; }
uint size_of() const { return sizeof(*this); }
Item_result result_type () const { return INT_RESULT; }
- int reset(void) { bzero(ptr, bytes_in_rec); return 0; }
+ int reset(void) {
+ bzero(ptr, bytes_in_rec);
+ if (bit_ptr && (bit_len > 0)) // reset odd bits among null bits
+ clr_rec_bits(bit_ptr, bit_ofs, bit_len);
+ return 0;
+ }
int store(const char *to, uint length, CHARSET_INFO *charset);
int store(double nr);
int store(longlong nr, bool unsigned_val);