summaryrefslogtreecommitdiff
path: root/storage/innobase/lock
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-01-12 13:30:10 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-01-12 13:47:18 +0200
commit1ba7234b211b4deec1e71f9b2d7db16543ece0e4 (patch)
tree89640a7765371a1e14e9b3d2a73b71412e478d26 /storage/innobase/lock
parent7c81f15ec3bcc8ad5a11e2151354bc27c4ce7ab4 (diff)
downloadmariadb-git-1ba7234b211b4deec1e71f9b2d7db16543ece0e4.tar.gz
Follow-up to MDEV-11713: Make more use of DBUG_LOG
Diffstat (limited to 'storage/innobase/lock')
-rw-r--r--storage/innobase/lock/lock0lock.cc21
1 files changed, 10 insertions, 11 deletions
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
index 5711a681e63..379d00b00d7 100644
--- a/storage/innobase/lock/lock0lock.cc
+++ b/storage/innobase/lock/lock0lock.cc
@@ -2780,12 +2780,10 @@ RecLock::jump_queue(
ut_ad(conflict_lock->trx->lock.que_state == TRX_QUE_LOCK_WAIT);
ut_ad(conflict_lock->trx->lock.wait_lock == conflict_lock);
-#ifdef UNIV_DEBUG
- ib::info() << "Granting High Priority Transaction (ID): "
- << lock->trx->id << " the lock jumping over"
- << " waiting Transaction (ID): "
- << conflict_lock->trx->id;
-#endif /* UNIV_DEBUG */
+ DBUG_LOG("trx",
+ "Granting High Priority Transaction "
+ << lock->trx->id << " a lock jumping over"
+ << " waiting Transaction " << conflict_lock->trx->id);
lock_reset_lock_and_trx_wait(lock);
return(true);
@@ -2954,11 +2952,12 @@ RecLock::make_trx_hit_list(
/* Assert that it is not waiting for current record. */
ut_ad(trx->lock.wait_lock != next);
-#ifdef UNIV_DEBUG
- ib::info() << "High Priority Transaction (ID): "
- << lock->trx->id << " waking up blocking"
- << " transaction (ID): " << trx->id;
-#endif /* UNIV_DEBUG */
+
+ DBUG_LOG("trx", "High Priority Transaction "
+ << lock->trx->id
+ << " waking up blocking transaction "
+ << trx->id);
+
trx->lock.was_chosen_as_deadlock_victim = true;
lock_cancel_waiting_and_release(trx->lock.wait_lock);
trx_mutex_exit(trx);