diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-30 12:29:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-08-30 12:29:47 +0300 |
| commit | 4c91fd4cd62e3cfa8949d4f6265c79943390b2d2 (patch) | |
| tree | cdbe677f837384fb7772fda3fb290db65d5874da /storage/xtradb/row | |
| parent | 01209de7637a7206c18788e08919b5ccf0b3d700 (diff) | |
| download | mariadb-git-4c91fd4cd62e3cfa8949d4f6265c79943390b2d2.tar.gz | |
Galera after-merge fixes
wsrep_drop_table_query(): Remove the definition of this ununsed function.
row_upd_sec_index_entry(), row_upd_clust_rec_by_insert():
Evaluate the simplest conditions first. The merge could have slightly
hurt performance by causing extra calls to wsrep_on().
Diffstat (limited to 'storage/xtradb/row')
| -rw-r--r-- | storage/xtradb/row/row0upd.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/row/row0upd.cc b/storage/xtradb/row/row0upd.cc index 2679e9a1c8a..91dbc5252bc 100644 --- a/storage/xtradb/row/row0upd.cc +++ b/storage/xtradb/row/row0upd.cc @@ -1988,9 +1988,9 @@ row_upd_sec_index_entry( index, offsets, thr, &mtr); } #ifdef WITH_WSREP - if (wsrep_on(trx->mysql_thd) && + if (err == DB_SUCCESS && !referenced && + wsrep_on(trx->mysql_thd) && !wsrep_thd_is_BF(trx->mysql_thd, FALSE) && - err == DB_SUCCESS && !referenced && !(parent && que_node_get_type(parent) == QUE_NODE_UPDATE && ((upd_node_t*)parent)->cascade_node == node) && @@ -2279,7 +2279,7 @@ err_exit: } } #ifdef WITH_WSREP - if (wsrep_on(trx->mysql_thd) && !referenced && + if (!referenced && wsrep_on(trx->mysql_thd) && !(parent && que_node_get_type(parent) == QUE_NODE_UPDATE && ((upd_node_t*)parent)->cascade_node == node) && foreign |