diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
| commit | 496e22cf3bd2a481fd3502d86e5a4e8228bf9823 (patch) | |
| tree | 80549f8005fcf3236bfa004a5aea35e4e67b36ca /sql/mdl.h | |
| parent | 45f484b8381a5923aec9c704e54c7f7bcfa02a40 (diff) | |
| parent | 26f56089c734852dc31d98fd73e1d8f1750bd1a8 (diff) | |
| download | mariadb-git-496e22cf3bd2a481fd3502d86e5a4e8228bf9823.tar.gz | |
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
Diffstat (limited to 'sql/mdl.h')
| -rw-r--r-- | sql/mdl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/mdl.h b/sql/mdl.h index 8d22eff1eff..75132962f8f 100644 --- a/sql/mdl.h +++ b/sql/mdl.h @@ -916,9 +916,7 @@ private: */ MDL_wait_for_subgraph *m_waiting_for; private: -#ifndef WITH_WSREP THD *get_thd() const { return m_owner->get_thd(); } -#endif MDL_ticket *find_ticket(MDL_request *mdl_req, enum_mdl_duration *duration); void release_locks_stored_before(enum_mdl_duration duration, MDL_ticket *sentinel); @@ -928,7 +926,7 @@ private: public: #ifdef WITH_WSREP - THD *get_thd() const { return m_owner->get_thd(); } + THD *wsrep_get_thd() const { return get_thd(); } #endif void find_deadlock(); |