diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-11-09 08:49:33 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-11-09 08:49:33 +0200 |
| commit | 1bba40f0dfae5b2c634a50a5de8a44ca63c55510 (patch) | |
| tree | 853f21673ea98f9eac2bd022b360b07067c9cd08 | |
| parent | fc1798785f4daf878e2c9f4c28ed35ca1af6dcba (diff) | |
| download | mariadb-git-1bba40f0dfae5b2c634a50a5de8a44ca63c55510.tar.gz | |
MDEV-10544: Galera: Failing assertion: (lock->trx)->wait_lock == lock
In Galera case this assertion is too strict as conflicting lock
could be same as lock here.
| -rw-r--r-- | storage/innobase/lock/lock0lock.c | 1 | ||||
| -rw-r--r-- | storage/xtradb/lock/lock0lock.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/storage/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c index cf77a9ebb8c..3890a2c44ff 100644 --- a/storage/innobase/lock/lock0lock.c +++ b/storage/innobase/lock/lock0lock.c @@ -798,7 +798,6 @@ lock_reset_lock_and_trx_wait( /* Reset the back pointer in trx to this waiting lock request */ if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) { - ut_ad((lock->trx)->wait_lock == lock); (lock->trx)->wait_lock = NULL; } else { ut_ad(lock_get_type_low(lock) == LOCK_REC); diff --git a/storage/xtradb/lock/lock0lock.c b/storage/xtradb/lock/lock0lock.c index c5f8d6770df..b6cee714dec 100644 --- a/storage/xtradb/lock/lock0lock.c +++ b/storage/xtradb/lock/lock0lock.c @@ -799,7 +799,6 @@ lock_reset_lock_and_trx_wait( /* Reset the back pointer in trx to this waiting lock request */ if (!(lock->type_mode & LOCK_CONV_BY_OTHER)) { - ut_ad((lock->trx)->wait_lock == lock); (lock->trx)->wait_lock = NULL; } else { ut_ad(lock_get_type_low(lock) == LOCK_REC); |