diff options
| author | heikki@hundin.mysql.fi <> | 2002-06-23 00:35:36 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-06-23 00:35:36 +0300 |
| commit | 1d225146e3cf43ebaf9031eb58e26d6fa82a85eb (patch) | |
| tree | d1d225caf1f28bb88e905789937c5ab55ed1327d /sql/slave.cc | |
| parent | 0c5ad2d6cb5ec43194ab4348cd6f15a484bb2969 (diff) | |
| download | mariadb-git-1d225146e3cf43ebaf9031eb58e26d6fa82a85eb.tar.gz | |
slave.cc:
Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index b535c87024b..32c478c369d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1024,7 +1024,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) mi->inc_pos(event_len); - if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN))) { + if (!(thd->options & OPTION_BEGIN)) { /* We only flush the master info position to the master.info file if the transaction is not open any more: an incomplete transaction will @@ -1155,7 +1155,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) mi->inc_pos(event_len); - if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN))) + if (!(thd->options & OPTION_BEGIN)) flush_master_info(mi); break; @@ -1190,7 +1190,7 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) pthread_cond_broadcast(&mi->cond); pthread_mutex_unlock(&mi->lock); - if (!(thd->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN))) + if (!(thd->options & OPTION_BEGIN)) flush_master_info(mi); #ifndef DBUG_OFF if(abort_slave_event_count) |