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-19 20:34:11 +0200
commitc0e3a6cabed6ddb0c84f9298c70c551810f18bbf (patch)
tree4c6142e7e96c3c9be8542531d163a079bd497a07
parent9ccd737114dbc53ada39b55e4d554758bd3f78e1 (diff)
downloadmariadb-git-preview-10.8-MDEV-11675-rpl-lag-free-alter.tar.gz
DBUG_ASSERT(flags != Gtid_log_event::FL_START_ALTER_E1...) in THD::set_binlog_flags_for_alterpreview-10.8-MDEV-11675-rpl-lag-free-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.
-rw-r--r--sql/log.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc
index d2c456f5257..7aa1e3a00de 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;