diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-11-17 09:55:55 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-11-17 09:59:52 +0200 |
| commit | 7bf391c2059f452eafb424336faa30d402f92b67 (patch) | |
| tree | 8c6782aa29e8a560aa63b4a5117788777ef33cc8 /storage/xtradb/srv | |
| parent | ea8322687254fad00143ff7850a67ea8c7f0027e (diff) | |
| download | mariadb-git-7bf391c2059f452eafb424336faa30d402f92b67.tar.gz | |
MDEV-7108: Make long semaphore wait timeout configurable
Merge Facebook commit https://github.com/facebook/mysql-5.6/commit/cd063ab930f05efdba39d504543998512d1bd71f
authored by Peng Tian from https://github.com/facebook/mysql-5.6
Introduced a new configuration variable innodb_fatal_semaphore_wait_threshold,
it makes the fatal semaphore timeout configurable. Modified original commit
so that no MariaDB server files are changed, instead introduced a new
InnoDB/XtraDB configuration variable.
Its default/min/max vlaues are 600/1/2^32-1 in seconds (it was hardcoded
as 600, now its default value is 600, so the default behavior of this diff
should be no change).
Diffstat (limited to 'storage/xtradb/srv')
| -rw-r--r-- | storage/xtradb/srv/srv0srv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/srv/srv0srv.cc b/storage/xtradb/srv/srv0srv.cc index 3495302a45f..6af5f0d782c 100644 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@ -95,7 +95,7 @@ in the server */ UNIV_INTERN ulint srv_activity_count = 0; /* The following is the maximum allowed duration of a lock wait. */ -UNIV_INTERN ulint srv_fatal_semaphore_wait_threshold = 600; +UNIV_INTERN ulong srv_fatal_semaphore_wait_threshold = DEFAULT_SRV_FATAL_SEMAPHORE_TIMEOUT; /**/ UNIV_INTERN long long srv_kill_idle_transaction = 0; |