summaryrefslogtreecommitdiff
path: root/sql/mdl.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-12-02 18:29:49 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-12-02 18:29:49 +0200
commit6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8 (patch)
tree3915bd814fa0ea7c0219b258a1fb458846a5b0bd /sql/mdl.h
parente76e12886fd37094d95ca40b8cce45ca3ef28021 (diff)
parent24ec8eaf66ecd864529309c5edcb8dd6b685f2aa (diff)
downloadmariadb-git-6a1e655cb0d400d8ed44fbfd22151b1d3e7f22d8.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/mdl.h')
-rw-r--r--sql/mdl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mdl.h b/sql/mdl.h
index f6b7154fba0..9dbf9aa7f4f 100644
--- a/sql/mdl.h
+++ b/sql/mdl.h
@@ -921,7 +921,7 @@ public:
void set_lock_duration(MDL_ticket *mdl_ticket, enum_mdl_duration duration);
void release_statement_locks();
- void release_transactional_locks();
+ void release_transactional_locks(THD *thd);
void release_explicit_locks();
void rollback_to_savepoint(const MDL_savepoint &mdl_savepoint);