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/xtradb/include/ut0wqueue.h | |
| parent | ba4d0a1b351ad3b8ddeea4b137bca4befe32e8c1 (diff) | |
| parent | 13493078e9aea37f6714b3921921aa10864c8b30 (diff) | |
| download | mariadb-git-3c47ed48490f0bab1996beab5b22f386451f0d88.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/xtradb/include/ut0wqueue.h')
| -rw-r--r-- | storage/xtradb/include/ut0wqueue.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/xtradb/include/ut0wqueue.h b/storage/xtradb/include/ut0wqueue.h index e6b9891aed1..d69363afe7b 100644 --- a/storage/xtradb/include/ut0wqueue.h +++ b/storage/xtradb/include/ut0wqueue.h @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 2006, 2009, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -116,7 +117,9 @@ ib_wqueue_len( struct ib_wqueue_t { ib_mutex_t mutex; /*!< mutex protecting everything */ ib_list_t* items; /*!< work item list */ - os_event_t event; /*!< event we use to signal additions to list */ + os_event_t event; /*!< event we use to signal additions to list; + os_event_set() and os_event_reset() are + protected by ib_wqueue_t::mutex */ }; #endif |