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

Merge 10.11 into 11.1

Browse source
This commit is contained in:
Marko Mäkelä 2024-06-17 09:21:50 +03:00
commit d34289a3e2
148 changed files with 2528 additions and 693 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/log_event_server.cc
View file

@ -1925,6 +1925,11 @@ int Query_log_event::do_apply_event(rpl_group_info *rgi,
thd->variables.pseudo_thread_id= thread_id; // for temp tables
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));
#endif
if (unlikely(!(expected_error= !is_rb_alter ? error_code : 0)) ||
ignored_error_code(expected_error) ||
!unexpected_error_code(expected_error))