diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-19 08:50:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-02-19 08:58:22 +0200 |
| commit | 3c419fde5f22d68f1c60402f37b91cf771c305df (patch) | |
| tree | 51d94501454a297bfa6ba49d7a9f0c791478bbe6 | |
| parent | acab33a1f28880aa78bb7f88989f18abac5a3531 (diff) | |
| download | mariadb-git-3c419fde5f22d68f1c60402f37b91cf771c305df.tar.gz | |
Cleanup after commit ac8e3c85a40467de0ffc908dd9c5214acf23b38a
srv_conc_t::n_active: Correct the comment, and remove an
assertion that trivially holds now that the type is unsigned.
| -rw-r--r-- | storage/innobase/srv/srv0conc.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc index 28eaca39af6..a1ffa8986a8 100644 --- a/storage/innobase/srv/srv0conc.cc +++ b/storage/innobase/srv/srv0conc.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2011, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2015, 2016, MariaDB Corporation. +Copyright (c) 2015, 2018, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -73,11 +73,7 @@ ulong srv_thread_concurrency = 0; struct srv_conc_t { char pad[CACHE_LINE_SIZE - (sizeof(ulint) + sizeof(lint))]; - /** Number of transactions that have declared_to_be_inside_innodb set. - It used to be a non-error for this value to drop below zero temporarily. - 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. */ - + /** Number of transactions that have declared_to_be_inside_innodb */ ulint n_active; /** Number of OS threads waiting in the FIFO for permission to @@ -273,8 +269,6 @@ srv_conc_force_enter_innodb( return; } - ut_ad(srv_conc.n_active >= 0); - (void) my_atomic_addlint(&srv_conc.n_active, 1); trx->n_tickets_to_enter_innodb = 1; |