diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 17:08:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-22 17:08:49 +0300 |
| commit | 1657b7a583c62deb72267d485bfe201f43909e11 (patch) | |
| tree | a750e2a44fdd296837b566623331e8a9a707d290 /sql/sql_class.cc | |
| parent | cca75c95bc3c5d0d4a2efb920d3942da3e658654 (diff) | |
| parent | 9868253b32877554a2707634dc6a6fd79c491053 (diff) | |
| download | mariadb-git-1657b7a583c62deb72267d485bfe201f43909e11.tar.gz | |
Merge 10.4 to 10.5
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index b94630274d5..6011dbbc6dd 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -2589,7 +2589,7 @@ void THD::give_protection_error() my_error(ER_BACKUP_LOCK_IS_ACTIVE, MYF(0)); else { - DBUG_ASSERT(global_read_lock.is_acquired()); + DBUG_ASSERT(global_read_lock.is_acquired() || mdl_backup_lock); my_error(ER_CANT_UPDATE_WITH_READLOCK, MYF(0)); } } |