diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 17:52:49 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 17:52:49 +0100 |
| commit | fad47df9957d754bec12d4d327c77ae04f71d903 (patch) | |
| tree | 58aaf6077adcb0bc0003228d30bed59687527650 /sql/sql_reload.cc | |
| parent | 9d7ed94f6a526748eff29dae2939a3fd341f118b (diff) | |
| parent | b7362d5fbc37dec340aeacd1fb0967c4226c022a (diff) | |
| download | mariadb-git-fad47df9957d754bec12d4d327c77ae04f71d903.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 8eedffdf41a..63b233faea6 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -525,6 +525,12 @@ bool flush_tables_with_read_lock(THD *thd, TABLE_LIST *all_tables) goto error; } + if (thd->current_backup_stage != BACKUP_FINISHED) + { + my_error(ER_BACKUP_LOCK_IS_ACTIVE, MYF(0)); + return true; + } + if (thd->lex->type & REFRESH_READ_LOCK) { /* |