summaryrefslogtreecommitdiff
path: root/storage/innobase/srv
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-01-07 15:36:08 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-01-07 15:36:08 +0200
commit8773a5e16199269be090cbed13ff892bac810cef (patch)
tree4c30f71715311fa0553380badfd48a9edb0aae2b /storage/innobase/srv
parent6790bf049ce340a056957ea1a445390b23f3aabe (diff)
downloadmariadb-git-8773a5e16199269be090cbed13ff892bac810cef.tar.gz
Post-fix MDEV-11695 Define a reasonable upper limit for innodb_spin_wait_delay
Change the parameter type from ulong to uint, so that 32-bit and 64-bit systems will report an identical result.
Diffstat (limited to 'storage/innobase/srv')
-rw-r--r--storage/innobase/srv/srv0srv.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index ab9f52b6596..002477bc4e0 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -418,7 +418,7 @@ ulong srv_replication_delay = 0;
/*-------------------------------------------*/
UNIV_INTERN ulong srv_n_spin_wait_rounds = 15;
-ulong srv_spin_wait_delay = 6;
+uint srv_spin_wait_delay;
ibool srv_priority_boost = TRUE;
static ulint srv_n_rows_inserted_old = 0;