diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-02 15:12:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 15:12:13 +0300 |
| commit | 15c7225a08b5ef39d07ece92b725592cd61163d7 (patch) | |
| tree | 33b835f5950a4f365c31675e70678c4c3fd90648 /sql | |
| parent | 0c724a0c7de3c74c2559c757b920c4aa488360b3 (diff) | |
| parent | 44016ec0ca27eddd7bc98916cc3f7e1d7ae81522 (diff) | |
| download | mariadb-git-15c7225a08b5ef39d07ece92b725592cd61163d7.tar.gz | |
Merge pull request #847 from tempesta-tech/tt-10.3-MDEV-16211
MDEV-16211 Contents of transaction_registry should not be replicated by Galera
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/table.cc | 1 | ||||
| -rw-r--r-- | sql/wsrep_applier.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc index 4b2c88cc0e9..54261c76ddc 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -8763,6 +8763,7 @@ bool TR_table::update(ulonglong start_id, ulonglong end_id) return true; store(FLD_BEGIN_TS, thd->transaction_time()); + thd->set_time(); timeval end_time= {thd->query_start(), long(thd->query_start_sec_part())}; store(FLD_TRX_ID, start_id); store(FLD_COMMIT_ID, end_id); diff --git a/sql/wsrep_applier.cc b/sql/wsrep_applier.cc index f2d90def5ef..1f50ee55711 100644 --- a/sql/wsrep_applier.cc +++ b/sql/wsrep_applier.cc @@ -146,6 +146,7 @@ static wsrep_cb_status_t wsrep_apply_events(THD* thd, /* Use the original server id for logging. */ thd->set_server_id(ev->server_id); thd->set_time(); // time the query + thd->transaction.start_time.reset(thd); wsrep_xid_init(&thd->transaction.xid_state.xid, thd->wsrep_trx_meta.gtid.uuid, thd->wsrep_trx_meta.gtid.seqno); |