mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.11 into 11.4

Browse source
This commit is contained in:
Marko Mäkelä 2024-12-02 11:35:34 +02:00
commit 2719cc4925
420 changed files with 6455 additions and 4165 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sql/log_event_server.cc
View file

@ -1847,10 +1847,7 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
{
bool is_rb_alter= gtid_flags_extra & Gtid_log_event::FL_ROLLBACK_ALTER_E1;
#ifdef WITH_WSREP
if (!wsrep_thd_is_applying(thd))
#endif
thd->set_time(when, when_sec_part);
thd->set_time(when, when_sec_part);
thd->set_query_and_id((char*)query_arg, q_len_arg,
thd->charset(), next_query_id());
thd->variables.pseudo_thread_id= thread_id; // for temp tables
@ -2468,10 +2465,10 @@ static void check_and_remove_stale_alter(Relay_log_info *rli)
{
DBUG_ASSERT(info->state == start_alter_state::REGISTERED);
sql_print_warning("ALTER query started at %u-%u-%llu could not "
sql_print_warning("ALTER query started at %u-%lu-%llu could not "
"be completed because of unexpected master server "
"or its binlog change", info->sa_seq_no, // todo:gtid
0, 0);
"or its binlog change", info->domain_id,
mi->master_id, info->sa_seq_no);
info_iterator.remove();
mysql_mutex_lock(&mi->start_alter_lock);
info->state= start_alter_state::ROLLBACK_ALTER;
@ -3672,7 +3669,7 @@ int Xid_apply_log_event::do_apply_event(rpl_group_info *rgi)
#endif
}
general_log_print(thd, COM_QUERY, get_query());
general_log_print(thd, COM_QUERY, "%s", get_query());
thd->variables.option_bits&= ~OPTION_GTID_BEGIN;
res= do_commit();
if (!res && rgi->gtid_pending)
@ -7399,7 +7396,7 @@ void issue_long_find_row_warning(Log_event_type type,
"while looking up records to be processed. Consider adding a "
"primary key (or unique key) to the table to improve "
"performance.",
evt_type, table_name, (long) delta, scan_type);
evt_type, table_name, delta, scan_type);
}
}
}