diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 10:38:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 10:38:09 +0300 |
| commit | 9c7a456a92262bdb44b85a05aa9f87369c5b063c (patch) | |
| tree | ae2354c36aa3220a6ca5e8becc41491b52b9881c /sql/mdl.h | |
| parent | 2a4f72b7d2ac30a771a14d097608b0ce282e021c (diff) | |
| parent | 77d8da57d744505838a7830afbc437e54cc03c50 (diff) | |
| download | mariadb-git-9c7a456a92262bdb44b85a05aa9f87369c5b063c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/mdl.h')
| -rw-r--r-- | sql/mdl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/mdl.h b/sql/mdl.h index 45d28cc3068..52c48768329 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -1,7 +1,7 @@ #ifndef MDL_H #define MDL_H /* Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. - Copyright (c) 2020, MariaDB + Copyright (c) 2020, 2021, MariaDB 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 @@ -905,6 +905,10 @@ public: m_tickets[MDL_TRANSACTION].is_empty() && m_tickets[MDL_EXPLICIT].is_empty()); } + bool has_explicit_locks() const + { + return !m_tickets[MDL_EXPLICIT].is_empty(); + } inline bool has_transactional_locks() const { return !m_tickets[MDL_TRANSACTION].is_empty(); |