diff options
| author | <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
|---|---|---|
| committer | <Dao-Gang.Qu@sun.com> | 2010-01-12 20:07:09 +0800 |
| commit | b805e3d4d6ae5835ec5d6dcafc7ba4e65103f0b2 (patch) | |
| tree | 81fd0ce6bdc321649671cd1240deb0d5b1248e49 /sql/rpl_rli.h | |
| parent | d866afe56f670d5739112fee01c122584ff60145 (diff) | |
| parent | e698ae01128fde4f82d4595e67a72cfac09ca125 (diff) | |
| download | mariadb-git-b805e3d4d6ae5835ec5d6dcafc7ba4e65103f0b2.tar.gz | |
Manual merge from next-mr.
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 5be27cfd6f4..a1ea4028c0c 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -22,6 +22,7 @@ struct RPL_TABLE_LIST; class Master_info; +extern uint sql_slave_skip_counter; /**************************************************************************** @@ -434,7 +435,7 @@ public: @retval false Replication thread is currently not inside a group */ bool is_in_group() const { - return (sql_thd->options & OPTION_BEGIN) || + return (sql_thd->variables.option_bits & OPTION_BEGIN) || (m_flags & (1UL << IN_STMT)); } |