diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-25 14:42:15 -0400 |
| commit | 3088d52c20eca10e5b8689648edef8f7fd49830a (patch) | |
| tree | fc75c000b47e753c04cb2c74e48d8b74d22a509f /mysys | |
| parent | 3c0b3babd9fdaa6d6697289368022cc152c77593 (diff) | |
| download | mariadb-git-3088d52c20eca10e5b8689648edef8f7fd49830a.tar.gz | |
bzr merge -r3933..3945 codership/5.5 (Non-InnoDB changes only).
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/thr_lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 4f7c727594b..59c08240bca 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -690,7 +690,7 @@ wsrep_break_lock( { if (wsrep_on(data->owner->mysql_thd) && wsrep_thd_is_brute_force && - wsrep_thd_is_brute_force(data->owner->mysql_thd)) + wsrep_thd_is_brute_force(data->owner->mysql_thd, TRUE)) { THR_LOCK_DATA *holder; @@ -715,7 +715,7 @@ wsrep_break_lock( holder; holder=holder->next) { - if (!wsrep_thd_is_brute_force(holder->owner->mysql_thd)) + if (!wsrep_thd_is_brute_force(holder->owner->mysql_thd, TRUE)) { wsrep_abort_thd(data->owner->mysql_thd, holder->owner->mysql_thd, FALSE); @@ -731,7 +731,7 @@ wsrep_break_lock( holder; holder=holder->next) { - if (!wsrep_thd_is_brute_force(holder->owner->mysql_thd)) + if (!wsrep_thd_is_brute_force(holder->owner->mysql_thd, TRUE)) { wsrep_abort_thd(data->owner->mysql_thd, holder->owner->mysql_thd, FALSE); |