Commit c6acdf7c authored by Nirbhay Choubey's avatar Nirbhay Choubey

MDEV-7203: replicate_events_marked_for_skip didn't work on Galera cluster

OPTION_SKIP_REPLICATION flag needs to be preserved for events received
on non-originating nodes.
parent 6f9e33ec
......@@ -149,7 +149,8 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd,
break;
}
thd->set_server_id(ev->server_id); // use the original server id for logging
/* Use the original server id for logging. */
thd->set_server_id(ev->server_id);
thd->set_time(); // time the query
wsrep_xid_init(&thd->transaction.xid_state.xid,
&thd->wsrep_trx_meta.gtid.uuid,
......@@ -162,6 +163,10 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd,
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);
ev->thd = thd;
exec_res = ev->apply_event(thd->wsrep_rgi);
DBUG_PRINT("info", ("exec_event result: %d", exec_res));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment