Merge branch '10.5' into 10.6

This commit is contained in:
Sergei Golubchik 2025-01-29 11:17:38 +01:00
commit 066e8d6aea
177 changed files with 3874 additions and 972 deletions

View file

@ -1738,8 +1738,11 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
DBUG_PRINT("query",("%s", thd->query()));
#ifdef WITH_WSREP
WSREP_DEBUG("Query_log_event thread=%llu for query=%s",
thd_get_thread_id(thd), wsrep_thd_query(thd));
if (WSREP(thd))
{
WSREP_DEBUG("Query_log_event thread=%llu for query=%s",
thd_get_thread_id(thd), wsrep_thd_query(thd));
}
#endif
if (unlikely(!(expected_error= error_code)) ||