diff options
author | Luis Soares <luis.soares@sun.com> | 2009-05-14 12:51:03 +0100 |
---|---|---|
committer | Luis Soares <luis.soares@sun.com> | 2009-05-14 12:51:03 +0100 |
commit | e8e8f2faf4d744d74b459f13d6dbb12ce6e16be0 (patch) | |
tree | 11ecce842fab67d48d32dd77122781bcbbb22282 /sql/log_event.cc | |
parent | 872ec20ede45565b280b88a72c469830aedf3c9e (diff) | |
parent | 60a2bbb8ddc1c3fe8ef3814794838c2ca17f2193 (diff) | |
download | mariadb-git-e8e8f2faf4d744d74b459f13d6dbb12ce6e16be0.tar.gz |
merge: 5.1-bt local bug fix branch --> 5.1-bt up-to-date.
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r-- | sql/log_event.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index cc144691fe1..92e0377861a 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -7861,10 +7861,11 @@ Table_map_log_event::Table_map_log_event(THD *thd, TABLE *tbl, ulong tid, /* Now set the size of the data to the size of the field metadata array - plus one or two bytes for number of elements in the field metadata array. + 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 + 2; + m_data_size+= m_field_metadata_size + 3; else m_data_size+= m_field_metadata_size + 1; |