summaryrefslogtreecommitdiff
path: root/storage/innobase/include/lock0lock.h
diff options
context:
space:
mode:
authorShaohua Wang <shaohua.wang@oracle.com>2016-07-28 13:08:52 +0800
committerMarko Mäkelä <marko.makela@mariadb.com>2017-04-24 15:09:18 +0300
commitd3a2f60e1a80a70f38ac8e86f297169bad812415 (patch)
tree8c1e938e4dedaebb341c6b268d3f9e3ff30bbd51 /storage/innobase/include/lock0lock.h
parent1a5ca702b1301b12bf97636bd8d168120a188681 (diff)
downloadmariadb-git-d3a2f60e1a80a70f38ac8e86f297169bad812415.tar.gz
BUG#23477773 OPTION TO TURN OFF/ON DEADLOCK CHECKER
Backport WL#9383 INNODB: ADD AN OPTION TO TURN OFF/ON DEADLOCK CHECKER (rb#12873) to 5.7.
Diffstat (limited to 'storage/innobase/include/lock0lock.h')
-rw-r--r--storage/innobase/include/lock0lock.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
index ca6a5286cde..e718189062d 100644
--- a/storage/innobase/include/lock0lock.h
+++ b/storage/innobase/include/lock0lock.h
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, MariaDB Corporation. All Rights Reserved.
+Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -55,6 +55,9 @@ extern ulong innodb_lock_schedule_algorithm;
// Forward declaration
class ReadView;
+/** The value of innodb_deadlock_detect */
+extern my_bool innobase_deadlock_detect;
+
/*********************************************************************//**
Gets the size of a lock struct.
@return size in bytes */