diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-01-20 11:36:41 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-01-20 11:36:41 +0800 |
| commit | 943f9217ab8a48de046e72f0c30069acf1af178d (patch) | |
| tree | a746fe110e24298308d72ca136c178606cb937be /sql/log_event.h | |
| parent | 7bbf4d243059e099621b9792e05fab8aae5ea529 (diff) | |
| parent | 39f2eeaae3a299e0916670aea4241c2f266a0081 (diff) | |
| download | mariadb-git-943f9217ab8a48de046e72f0c30069acf1af178d.tar.gz | |
Auto Merge from 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 9b91d826da7..4e8edbf79b6 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -3350,16 +3350,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, @@ -3372,7 +3370,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); } #endif ulong get_table_id() const { return m_table_id; } |