diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
| commit | 0ce6d93f858eb5b67f8988946274ab2b9f060de4 (patch) | |
| tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /sql/rpl_rli.h | |
| parent | c2fe19883e624ddd0e37768f860fa0853848adb3 (diff) | |
| parent | e698ae01128fde4f82d4595e67a72cfac09ca125 (diff) | |
| download | mariadb-git-0ce6d93f858eb5b67f8988946274ab2b9f060de4.tar.gz | |
Merge next-mr -> next-4284.
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 f4111f0dae4..0ab5a4d8d35 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; /**************************************************************************** @@ -427,7 +428,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)); } |