diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-09 13:02:52 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-09 13:02:52 +0200 |
| commit | 45f6262f54c5d1ef535c0529c399a7352b5fdea4 (patch) | |
| tree | f77c15c8a9a4d3a0d7940477583c8cc8ccb79700 /storage/innobase/trx | |
| parent | ba4e56d8d753b57815edd38fb17bd2a2a1d9ca8c (diff) | |
| download | mariadb-git-45f6262f54c5d1ef535c0529c399a7352b5fdea4.tar.gz | |
MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replication causing replication to fail.
After-review changes. Fix InnoDB coding style issues.
Diffstat (limited to 'storage/innobase/trx')
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 7247080d4f2..4f8e4ad4487 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -1921,10 +1921,11 @@ trx_weight_ge( /* First ask the upper server layer if it has any preference for which to prefer as a deadlock victim. */ pref= thd_deadlock_victim_preference(a->mysql_thd, b->mysql_thd); - if (pref < 0) + if (pref < 0) { return FALSE; - else if (pref > 0) + } else if (pref > 0) { return TRUE; + } /* Upper server layer had no preference, we fall back to comparing the number of altered/locked rows. */ |