diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /storage/innobase/lock/lock0lock.cc | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/innobase/lock/lock0lock.cc')
| -rw-r--r-- | storage/innobase/lock/lock0lock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc index a37ad19e81d..134853dd0d7 100644 --- a/storage/innobase/lock/lock0lock.cc +++ b/storage/innobase/lock/lock0lock.cc @@ -800,7 +800,7 @@ lock_reset_lock_and_trx_wait( stmt2 = innobase_get_stmt_unsafe(lock->trx->lock.wait_lock->trx->mysql_thd, &stmt_len); } - ib::info() << + ib::error() << "Trx id " << lock->trx->id << " is waiting a lock in statement " << (stmt ? stmt : "NULL") @@ -808,7 +808,7 @@ lock_reset_lock_and_trx_wait( << " and statement " << (stmt2 ? stmt2 : "NULL") << "wait_lock " << lock->trx->lock.wait_lock; - ut_ad(lock->trx->lock.wait_lock != lock); + ut_ad(0); } lock->trx->lock.wait_lock = NULL; |