diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-01 11:02:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-02 09:36:04 +0300 |
| commit | 3d615e4b1aa4f945f69d310f9a19de80fbaccdca (patch) | |
| tree | 1d23c043ef41badf359760b70db84bc825a8b4a5 /sql/mdl.cc | |
| parent | 896c2c73a02c7e82299b00e66ee3ff5f85aa3adc (diff) | |
| parent | 959891662dfbb0b860f0bc70e09bc2c92dab831b (diff) | |
| download | mariadb-git-3d615e4b1aa4f945f69d310f9a19de80fbaccdca.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
This excludes MDEV-12472 (InnoDB should accept XtraDB parameters,
warning that they are ignored). In other words, MariaDB 10.3 will not
recognize any XtraDB-specific parameters.
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index db7291d9b6a..87a0171a193 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -2328,12 +2328,6 @@ MDL_context::upgrade_shared_lock(MDL_ticket *mdl_ticket, if (mdl_ticket->has_stronger_or_equal_type(new_type)) DBUG_RETURN(FALSE); - /* Only allow upgrades from SHARED_UPGRADABLE/NO_WRITE/NO_READ_WRITE/READ */ - DBUG_ASSERT(mdl_ticket->m_type == MDL_SHARED_UPGRADABLE || - mdl_ticket->m_type == MDL_SHARED_NO_WRITE || - mdl_ticket->m_type == MDL_SHARED_NO_READ_WRITE || - mdl_ticket->m_type == MDL_SHARED_READ); - mdl_xlock_request.init(&mdl_ticket->m_lock->key, new_type, MDL_TRANSACTION); |