From 541b57316f20c25c019ce21f27e1d1e63dfb51fa Mon Sep 17 00:00:00 2001
From: Andrei <andrei.elkin@mariadb.com>
Date: Wed, 19 Jan 2022 20:34:11 +0200
Subject: DBUG_ASSERT(flags != Gtid_log_event::FL_START_ALTER_E1...) in
 THD::set_binlog_flags_for_alter

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.
---
 sql/log.cc | 2 ++
 1 file changed, 2 insertions(+)

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;
-- 
cgit v1.2.1