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 | 056ac55aa0954b3321aa5e838a5563e731c1c516 (patch) | |
| tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /sql/rpl_rli.cc | |
| parent | a6daa9ada052b7b7b09683ea6d565c92f5e15512 (diff) | |
| parent | 3701208a2e890d42aabc678a2a5d4ea539941b36 (diff) | |
| download | mariadb-git-056ac55aa0954b3321aa5e838a5563e731c1c516.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc index 0461b810b29..fd3e9b593a8 100644 --- a/sql/rpl_rli.cc +++ b/sql/rpl_rli.cc @@ -1044,7 +1044,7 @@ bool Relay_log_info::is_until_satisfied(THD *thd, Log_event *ev) DBUG_RETURN(FALSE); log_name= group_master_log_name; log_pos= (!ev)? group_master_log_pos : - ((thd->options & OPTION_BEGIN || !ev->log_pos) ? + ((thd->variables.option_bits & OPTION_BEGIN || !ev->log_pos) ? group_master_log_pos : ev->log_pos - ev->data_written); } else @@ -1169,7 +1169,7 @@ void Relay_log_info::stmt_done(my_off_t event_master_log_pos, middle of the "transaction". START SLAVE will resume at BEGIN while the MyISAM table has already been updated. */ - if ((sql_thd->options & OPTION_BEGIN) && opt_using_transactions) + if ((sql_thd->variables.option_bits & OPTION_BEGIN) && opt_using_transactions) inc_event_relay_log_pos(); else { @@ -1223,8 +1223,8 @@ void Relay_log_info::cleanup_context(THD *thd, bool error) /* Cleanup for the flags that have been set at do_apply_event. */ - thd->options&= ~OPTION_NO_FOREIGN_KEY_CHECKS; - thd->options&= ~OPTION_RELAXED_UNIQUE_CHECKS; + thd->variables.option_bits&= ~OPTION_NO_FOREIGN_KEY_CHECKS; + thd->variables.option_bits&= ~OPTION_RELAXED_UNIQUE_CHECKS; DBUG_VOID_RETURN; } |