database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.7' into 10.8

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-02-04 14:50:25 +01:00
parent c0f5fd2754 9ed8deb656
commit 4fb2cb1a30
907 changed files with 20182 additions and 6211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/log_event_server.cc
View File

@@ -125,6 +125,7 @@ static const char *HA_ERR(int i)
case HA_ERR_LOGGING_IMPOSSIBLE: return "HA_ERR_LOGGING_IMPOSSIBLE";
case HA_ERR_CORRUPT_EVENT: return "HA_ERR_CORRUPT_EVENT";
case HA_ERR_ROWS_EVENT_APPLY : return "HA_ERR_ROWS_EVENT_APPLY";
case HA_ERR_PARTITION_LIST : return "HA_ERR_PARTITION_LIST";
}
return "No Error!";
}
@@ -2694,7 +2695,7 @@ int Format_description_log_event::do_apply_event(rpl_group_info *rgi)
original place when it comes to us; we'll know this by checking
log_pos ("artificial" events have log_pos == 0).
*/
if (!is_artificial_event() && created && !thd->rgi_fake)
if (!is_artificial_event() && created && !thd->rli_fake && !thd->rgi_fake)
{
// check_and_remove stale Start Alter:s
if (flags & LOG_EVENT_BINLOG_IN_USE_F)