summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei <andrei.elkin@mariadb.com>2022-01-19 20:34:11 +0200
committerAndrei <andrei.elkin@mariadb.com>2022-01-20 20:16:50 +0200
commit541b57316f20c25c019ce21f27e1d1e63dfb51fa (patch)
tree851ed902299604b04fb7a923820f6ee3a374e4b9
parent6972cff370abed64dd670799e86be98e7c04707e (diff)
downloadmariadb-git-bb-10.8-MDEV-11675.tar.gz
DBUG_ASSERT(flags != Gtid_log_event::FL_START_ALTER_E1...) in THD::set_binlog_flags_for_alterbb-10.8-MDEV-11675
is fixed to reset binlog_cache_mngr::gtid_flags3 in the error return from write_bin_log() of write_bin_log_start_alter(). In other error cases gtid_flags3 has been reset correctly for any flag value.
-rw-r--r--sql/log.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 6be5555a8bd..d6c9ef14b80 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -679,6 +679,8 @@ bool write_bin_log_start_alter(THD *thd, bool& partial_alter,
if(write_bin_log_with_if_exists(thd, false, false, if_exists, false))
{
DBUG_ASSERT(thd->is_error());
+
+ thd->set_binlog_flags_for_alter(0);
return true;
}
partial_alter= true;