diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-17 19:15:41 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-17 19:15:41 +0100 |
| commit | 96d4a0384629e5cddc93ee215e7af484e4b95bde (patch) | |
| tree | a3ede97cb903df372ac9f7a5733905d7d9b19301 /sql/log_event.cc | |
| parent | ae49d9710b791d1eaf7f552a44067c5108bd8c85 (diff) | |
| parent | 2c5f439d651f00f2f13d1f8e94f3701dadf9c7d3 (diff) | |
| download | mariadb-git-96d4a0384629e5cddc93ee215e7af484e4b95bde.tar.gz | |
Merging with mysql-5.1-bugteam
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 8e8e7bd4338..e560580a909 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -7896,7 +7896,7 @@ int Table_map_log_event::save_field_metadata() */ #if !defined(MYSQL_CLIENT) Table_map_log_event::Table_map_log_event(THD *thd, TABLE *tbl, ulong tid, - bool is_transactional, uint16 flags) + bool is_transactional) : Log_event(thd, 0, true), m_table(tbl), m_dbnam(tbl->s->db.str), @@ -7906,7 +7906,7 @@ Table_map_log_event::Table_map_log_event(THD *thd, TABLE *tbl, ulong tid, m_colcnt(tbl->s->fields), m_memory(NULL), m_table_id(tid), - m_flags(flags), + m_flags(TM_BIT_LEN_EXACT_F), m_data_size(0), m_field_metadata(0), m_field_metadata_size(0), @@ -8164,8 +8164,10 @@ int Table_map_log_event::do_apply_event(Relay_log_info const *rli) inside Relay_log_info::clear_tables_to_lock() by calling the table_def destructor explicitly. */ - new (&table_list->m_tabledef) table_def(m_coltype, m_colcnt, - m_field_metadata, m_field_metadata_size, m_null_bits); + new (&table_list->m_tabledef) + table_def(m_coltype, m_colcnt, + m_field_metadata, m_field_metadata_size, + m_null_bits, m_flags); table_list->m_tabledef_valid= TRUE; /* |