Commit 983de3e2 authored by mats@kindahl-laptop.dnsalias.net's avatar mats@kindahl-laptop.dnsalias.net

Merge kindahl-laptop.dnsalias.net:/home/bk/b31076-mysql-5.1-rpl

into  kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-release
parents 8aa3bb04 b2f5b2e8
...@@ -6621,6 +6621,7 @@ Table_map_log_event::Table_map_log_event(THD *thd, TABLE *tbl, ulong tid, ...@@ -6621,6 +6621,7 @@ Table_map_log_event::Table_map_log_event(THD *thd, TABLE *tbl, ulong tid,
m_tblnam(tbl->s->table_name.str), m_tblnam(tbl->s->table_name.str),
m_tbllen(tbl->s->table_name.length), m_tbllen(tbl->s->table_name.length),
m_colcnt(tbl->s->fields), m_field_metadata(0), m_colcnt(tbl->s->fields), m_field_metadata(0),
m_field_metadata_size(0), m_memory(NULL), m_meta_memory(NULL), m_data_size(0),
m_table_id(tid), m_null_bits(0), m_flags(flags) m_table_id(tid), m_null_bits(0), m_flags(flags)
{ {
DBUG_ASSERT(m_table_id != ~0UL); DBUG_ASSERT(m_table_id != ~0UL);
...@@ -6693,10 +6694,13 @@ Table_map_log_event::Table_map_log_event(const char *buf, uint event_len, ...@@ -6693,10 +6694,13 @@ Table_map_log_event::Table_map_log_event(const char *buf, uint event_len,
: Log_event(buf, description_event), : Log_event(buf, description_event),
#ifndef MYSQL_CLIENT #ifndef MYSQL_CLIENT
m_table(NULL), m_table(NULL),
#endif #endif
m_memory(NULL), m_dbnam(NULL), m_dblen(0), m_tblnam(NULL), m_tbllen(0),
m_field_metadata(0), m_field_metadata_size(0), m_null_bits(0) m_colcnt(0), m_coltype(0),
m_memory(NULL), m_table_id(ULONG_MAX), m_flags(0),
m_data_size(0), m_field_metadata(0), m_field_metadata_size(0),
m_null_bits(0), m_meta_memory(NULL)
{ {
unsigned int bytes_read= 0; unsigned int bytes_read= 0;
DBUG_ENTER("Table_map_log_event::Table_map_log_event(const char*,uint,...)"); DBUG_ENTER("Table_map_log_event::Table_map_log_event(const char*,uint,...)");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment