diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-10-30 00:09:02 +0400 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2018-12-09 22:12:26 +0200 |
| commit | 7a9dfdd8d985040778881fe815cfca019fdd37f1 (patch) | |
| tree | 14d7ba342917bc5288df828f95f8ce79d520592f /sql/sp.cc | |
| parent | 7fb9d64989ad8bb86ee47ded88dc5e2493aca4b8 (diff) | |
| download | mariadb-git-7a9dfdd8d985040778881fe815cfca019fdd37f1.tar.gz | |
Combine GLOBAL and COMMIT namespaces into BACKUP namespace.
Part of MDEV-5336 Implement LOCK FOR BACKUP
Other things:
- Added printing of MDL locks to DBUG.
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index d37ea543219..665a47cc384 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1794,8 +1794,8 @@ bool lock_db_routines(THD *thd, const char *db) close_system_tables(thd, &open_tables_state_backup); /* We should already hold a global IX lock and a schema X lock. */ - DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::GLOBAL, "", "", - MDL_INTENTION_EXCLUSIVE) && + DBUG_ASSERT(thd->mdl_context.is_lock_owner(MDL_key::BACKUP, "", "", + MDL_BACKUP_STMT) && thd->mdl_context.is_lock_owner(MDL_key::SCHEMA, db, "", MDL_EXCLUSIVE)); DBUG_RETURN(thd->mdl_context.acquire_locks(&mdl_requests, |