diff options
| author | Sujatha Sivakumar <sujatha.sivakumar@mariadb.com> | 2019-03-08 11:28:04 +0530 |
|---|---|---|
| committer | Sujatha Sivakumar <sujatha.sivakumar@mariadb.com> | 2019-03-08 11:28:04 +0530 |
| commit | 7de8470b1166dbcf9f306aa66c5fed522eebf204 (patch) | |
| tree | cc9d12d86a74a229029034e93816ccf95882fe9b | |
| parent | 4ca2079142e92f2ce682d463f2e175339e5d79bc (diff) | |
| download | mariadb-git-bb-10.2-MDEV-13895-v2.tar.gz | |
Version 2bb-10.2-MDEV-13895-v2
| -rw-r--r-- | sql/slave.cc | 8 | ||||
| -rw-r--r-- | sql/wsrep_applier.cc | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f3e08f14213..62ea1492d2e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -71,7 +71,6 @@ bool use_slave_mask = 0; MY_BITMAP slave_error_mask; char slave_skip_error_names[SHOW_VAR_FUNC_BUFF_SIZE]; - char* slave_load_tmpdir = 0; Master_info *active_mi= 0; Master_info_index *master_info_index; @@ -3532,12 +3531,15 @@ 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); + fprintf(stderr,"--------ev->type:%d\n", ev->get_type_code()); + fprintf(stderr,"--------ev->when:%ld\n", ev->when); 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); @@ -3896,6 +3898,8 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, DBUG_ASSERT(rli->last_master_timestamp >= 0); } + if (ev->when == 0) + ev->when= (my_time_t)rli->last_master_timestamp; /* This tests if the position of the beginning of the current event hits the UNTIL barrier. diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index be6297abd09..a1f3ef599a5 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -149,12 +149,13 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd, thd->wsrep_trx_meta.gtid.uuid, thd->wsrep_trx_meta.gtid.seqno); 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) | |