summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <mats@kindahl-laptop.dnsalias.net>2007-09-24 10:50:57 +0200
committerunknown <mats@kindahl-laptop.dnsalias.net>2007-09-24 10:50:57 +0200
commita78445a7bcf476ed0ab49f2f3ac89304ae6cde55 (patch)
tree877671fd558997539af5fe25abfce94513a4de21
parente40080ea66cc83d668a773e03652cd9c8881711e (diff)
downloadmariadb-git-a78445a7bcf476ed0ab49f2f3ac89304ae6cde55.tar.gz
BUG#31076 (Server crashes when start slave is issued):
Second patch to initailize more uninitialized variables. sql/log_event.cc: Intializing several uninitialized fields in the Table_map_log_event.
-rw-r--r--sql/log_event.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 4508604643b..4d78476392e 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -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_tbllen(tbl->s->table_name.length),
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)
{
DBUG_ASSERT(m_table_id != ~0UL);
@@ -6693,10 +6694,13 @@ Table_map_log_event::Table_map_log_event(const char *buf, uint event_len,
: Log_event(buf, description_event),
#ifndef MYSQL_CLIENT
- m_table(NULL),
+ m_table(NULL),
#endif
- m_memory(NULL),
- m_field_metadata(0), m_field_metadata_size(0), m_null_bits(0)
+ m_dbnam(NULL), m_dblen(0), m_tblnam(NULL), m_tbllen(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;
DBUG_ENTER("Table_map_log_event::Table_map_log_event(const char*,uint,...)");