summaryrefslogtreecommitdiff
path: root/innobase/lock/lock0lock.c
diff options
context:
space:
mode:
Diffstat (limited to 'innobase/lock/lock0lock.c')
-rw-r--r--innobase/lock/lock0lock.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c
index d9848577728..11bd1f93808 100644
--- a/innobase/lock/lock0lock.c
+++ b/innobase/lock/lock0lock.c
@@ -292,9 +292,7 @@ waiting, in its lock queue. Solution: We can copy the locks as gap type
locks, so that also the waiting locks are transformed to granted gap type
locks on the inserted record. */
-#ifdef UNIV_DEBUG
ibool lock_print_waits = FALSE;
-#endif /* UNIV_DEBUG */
/* The lock system */
lock_sys_t* lock_sys = NULL;
@@ -1354,8 +1352,7 @@ lock_rec_has_expl(
return(NULL);
}
-
-#ifdef UNIV_DEBUG
+
/*************************************************************************
Checks if some other transaction has a lock request in the queue. */
static
@@ -1398,7 +1395,6 @@ lock_rec_other_has_expl_req(
return(NULL);
}
-#endif /* UNIV_DEBUG */
/*************************************************************************
Checks if some other transaction has a conflicting explicit lock request
@@ -1688,13 +1684,11 @@ lock_rec_enqueue_waiting(
ut_a(que_thr_stop(thr));
-#ifdef UNIV_DEBUG
if (lock_print_waits) {
fprintf(stderr, "Lock wait for trx %lu in index ",
ut_dulint_get_low(trx->id));
ut_print_name(stderr, index->name);
}
-#endif /* UNIV_DEBUG */
return(DB_LOCK_WAIT);
}
@@ -2034,12 +2028,10 @@ lock_grant(
lock->trx->n_tables_locked++;
}
-#ifdef UNIV_DEBUG
if (lock_print_waits) {
fprintf(stderr, "Lock wait for trx %lu ends\n",
ut_dulint_get_low(lock->trx->id));
}
-#endif /* UNIV_DEBUG */
/* If we are resolving a deadlock by choosing another transaction
as a victim, then our original transaction may not be in the
@@ -3110,11 +3102,9 @@ lock_deadlock_recursive(
lock_table_print(ef, start->wait_lock);
}
-#ifdef UNIV_DEBUG
if (lock_print_waits) {
fputs("Deadlock detected\n", stderr);
}
-#endif /* UNIV_DEBUG */
if (ut_dulint_cmp(wait_lock->trx->undo_no,
start->undo_no) >= 0) {
@@ -4174,7 +4164,6 @@ loop:
goto loop;
}
-#ifdef UNIV_DEBUG
/*************************************************************************
Validates the lock queue on a table. */
@@ -4485,7 +4474,6 @@ lock_validate(void)
return(TRUE);
}
-#endif /* UNIV_DEBUG */
/*============ RECORD LOCK CHECKS FOR ROW OPERATIONS ====================*/