diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-02 11:04:54 +0300 |
| commit | 5c3ff5cb93f8363820d506cdad3daafbc944f03b (patch) | |
| tree | f5671e95dabd8ced0c7925e54b351bd704e41bcf /sql/slave.cc | |
| parent | f9ab7b473a935141f85d27994d0faf3433a73144 (diff) | |
| parent | 7b42d892de6acc04490f5cb6b8355c72b8f1a406 (diff) | |
| download | mariadb-git-5c3ff5cb93f8363820d506cdad3daafbc944f03b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f5bfd0f1974..52cecf2fd36 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3912,12 +3912,6 @@ apply_event_and_update_pos_setup(Log_event* ev, THD* thd, rpl_group_info *rgi) thd->variables.server_id = ev->server_id; thd->set_time(); // time the query thd->lex->current_select= 0; - if (!ev->when) - { - my_hrtime_t hrtime= my_hrtime(); - ev->when= hrtime_to_my_time(hrtime); - ev->when_sec_part= hrtime_sec_part(hrtime); - } thd->variables.option_bits= (thd->variables.option_bits & ~OPTION_SKIP_REPLICATION) | (ev->flags & LOG_EVENT_SKIP_REPLICATION_F ? OPTION_SKIP_REPLICATION : 0); |