diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-01-14 10:47:23 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-01-14 10:47:23 +0000 |
| commit | ebc009c9b387776601d40b1acf22bb1e79aa44ca (patch) | |
| tree | e883fb00b0d988d37e2e7ea19a92554a7df38197 /sql/log_event.cc | |
| parent | a0fe99a859d1fa201a0f43de6b7a6bc0788b307d (diff) | |
| parent | 585303295fba0ecb01da868adc59de7a04a0d484 (diff) | |
| download | mariadb-git-ebc009c9b387776601d40b1acf22bb1e79aa44ca.tar.gz | |
BUG#50018: automerge from 5.1-bt local --> 5.1-bt local latest.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index d7eaa57c23b..6b21087b6aa 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -7926,10 +7926,10 @@ Table_map_log_event::Table_map_log_event(THD *thd, TABLE *tbl, ulong tid, plus one or three bytes (see pack.c:net_store_length) for number of elements in the field metadata array. */ - if (m_field_metadata_size > 255) - m_data_size+= m_field_metadata_size + 3; - else + if (m_field_metadata_size < 251) m_data_size+= m_field_metadata_size + 1; + else + m_data_size+= m_field_metadata_size + 3; bzero(m_null_bits, num_null_bytes); for (unsigned int i= 0 ; i < m_table->s->fields ; ++i) |