diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 07:47:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-08 07:47:49 +0300 |
| commit | 7b48da4d7e84759b9d4ceb40b9aeb6d28b27f93c (patch) | |
| tree | b437f9ab63a66034822348f77f6b4654a9a95669 /sql/sql_alter.cc | |
| parent | 81258f14323e1d1ad0203bae93bc55a30d47c1b3 (diff) | |
| parent | f69c1c9dcb815d7597ec2035470a81ac3b6c9380 (diff) | |
| download | mariadb-git-7b48da4d7e84759b9d4ceb40b9aeb6d28b27f93c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 0184f6beaf4..7901c9b5e32 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -491,7 +491,7 @@ bool Sql_cmd_alter_table::execute(THD *thd) if (check_grant(thd, priv_needed, first_table, FALSE, UINT_MAX, FALSE)) DBUG_RETURN(TRUE); /* purecov: inspected */ #ifdef WITH_WSREP - if (WSREP(thd) && WSREP_CLIENT(thd) && + if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() || !thd->find_temporary_table(first_table))) { |