diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 13:28:13 +0300 |
commit | c06845d6f04e092b64c105eb6786056cea2ab593 (patch) | |
tree | cfd3f3abc32ab96fb918d3c00ffc68f072ca29bc /storage/innobase/row/row0upd.cc | |
parent | 2c5067b6890974d0df335a833ed7a4e4c6ced183 (diff) | |
parent | edbdfc2f995eb47ba49235195aca00888aeacbc4 (diff) | |
download | mariadb-git-c06845d6f04e092b64c105eb6786056cea2ab593.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/row/row0upd.cc')
-rw-r--r-- | storage/innobase/row/row0upd.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index 943e31d99fe..31d4d31c1f9 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -464,7 +464,7 @@ func_exit: inline bool wsrep_must_process_fk(const upd_node_t* node, const trx_t* trx) { - if (!wsrep_on_trx(trx)) { + if (!trx->is_wsrep()) { return false; } return que_node_get_type(node->common.parent) != QUE_NODE_UPDATE |