diff options
author | Mats Kindahl <mats@sun.com> | 2009-12-15 21:21:00 +0100 |
---|---|---|
committer | Mats Kindahl <mats@sun.com> | 2009-12-15 21:21:00 +0100 |
commit | f9abd14225821a3912a15baa199bcbec7d9e65c1 (patch) | |
tree | d3057d76feb0f4419510a9a2a77dcc4263948d7f /sql/log_event.h | |
parent | ac647f5a3eb12313f981800ac1fd0c562402abcc (diff) | |
parent | 9e980bf79ef0c727c630e79c1bc043c48bc947ee (diff) | |
download | mariadb-git-f9abd14225821a3912a15baa199bcbec7d9e65c1.tar.gz |
Merging with mysql-5.1-rep+2
Diffstat (limited to 'sql/log_event.h')
-rw-r--r-- | sql/log_event.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index cd5e659c910..d4168a87331 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -3304,16 +3304,14 @@ public: /* Special constants representing sets of flags */ enum { - TM_NO_FLAGS = 0U + TM_NO_FLAGS = 0U, + TM_BIT_LEN_EXACT_F = (1U << 0) }; - void set_flags(flag_set flag) { m_flags |= flag; } - void clear_flags(flag_set flag) { m_flags &= ~flag; } flag_set get_flags(flag_set flag) const { return m_flags & flag; } #ifndef MYSQL_CLIENT - Table_map_log_event(THD *thd, TABLE *tbl, ulong tid, - bool is_transactional, uint16 flags); + Table_map_log_event(THD *thd, TABLE *tbl, ulong tid, bool is_transactional); #endif #ifdef HAVE_REPLICATION Table_map_log_event(const char *buf, uint event_len, @@ -3326,7 +3324,7 @@ public: table_def *create_table_def() { return new table_def(m_coltype, m_colcnt, m_field_metadata, - m_field_metadata_size, m_null_bits); + m_field_metadata_size, m_null_bits, m_flags); } ulong get_table_id() const { return m_table_id; } const char *get_table_name() const { return m_tblnam; } |