diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-14 18:39:56 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-14 18:39:56 +0000 |
| commit | ac8e3c85a40467de0ffc908dd9c5214acf23b38a (patch) | |
| tree | 42d7927f707495576ff0876c93c60e6011dc73a5 /storage/innobase/srv/srv0conc.cc | |
| parent | 1a10b261d0c810efe56a84ead44eb841762fb5c6 (diff) | |
| download | mariadb-git-ac8e3c85a40467de0ffc908dd9c5214acf23b38a.tar.gz | |
MDEV-15295 Type mismatch for srv_fatal_semaphore_wait_threshold
Diffstat (limited to 'storage/innobase/srv/srv0conc.cc')
| -rw-r--r-- | storage/innobase/srv/srv0conc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc index 9f589b57d9c..28eaca39af6 100644 --- a/storage/innobase/srv/srv0conc.cc +++ b/storage/innobase/srv/srv0conc.cc @@ -78,11 +78,11 @@ struct srv_conc_t { This is no longer true. We'll, however, keep the lint datatype to add assertions to catch any corner cases that we may have missed. */ - volatile lint n_active; + ulint n_active; /** Number of OS threads waiting in the FIFO for permission to enter InnoDB */ - volatile lint n_waiting; + ulint n_waiting; }; /* Control variables for tracking concurrency. */ @@ -152,7 +152,7 @@ srv_conc_enter_innodb_with_atomics( return; } - if (srv_conc.n_active < (lint) srv_thread_concurrency) { + if (srv_conc.n_active < srv_thread_concurrency) { ulint n_active; /* Check if there are any free tickets. */ |