diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-20 14:02:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-20 14:02:40 +0200 |
| commit | 3c47ed48490f0bab1996beab5b22f386451f0d88 (patch) | |
| tree | c374857b2f5d22bd86354877a098a0cd7967fa9e /storage/innobase/srv/srv0conc.cc | |
| parent | ba4d0a1b351ad3b8ddeea4b137bca4befe32e8c1 (diff) | |
| parent | 13493078e9aea37f6714b3921921aa10864c8b30 (diff) | |
| download | mariadb-git-3c47ed48490f0bab1996beab5b22f386451f0d88.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/srv/srv0conc.cc')
| -rw-r--r-- | storage/innobase/srv/srv0conc.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/innobase/srv/srv0conc.cc b/storage/innobase/srv/srv0conc.cc index 8942eb20080..c0877e33039 100644 --- a/storage/innobase/srv/srv0conc.cc +++ b/storage/innobase/srv/srv0conc.cc @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2011, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. All Rights Reserved. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -78,7 +79,9 @@ typedef UT_LIST_NODE_T(struct srv_conc_slot_t) srv_conc_node_t; /** Slot for a thread waiting in the concurrency control queue. */ struct srv_conc_slot_t{ - os_event_t event; /*!< event to wait */ + os_event_t event; /*!< event to wait for; + os_event_set() and os_event_reset() + are protected by srv_conc_mutex */ ibool reserved; /*!< TRUE if slot reserved */ ibool wait_ended; /*!< TRUE when another thread has @@ -372,11 +375,11 @@ srv_conc_exit_innodb_without_atomics( } } - os_fast_mutex_unlock(&srv_conc_mutex); - if (slot != NULL) { os_event_set(slot->event); } + + os_fast_mutex_unlock(&srv_conc_mutex); } /*********************************************************************//** |