database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merged revisions 3425..3430 from mariadb-galera-5.5

Browse Source
This commit is contained in:
Seppo Jaakola
2013-10-07 09:43:19 +03:00
parent 255e20a175
commit 61bda9a2f0
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_parse.cc
View File

@ -8617,6 +8617,9 @@ static void wsrep_client_rollback(THD *thd)
/* Release transactional metadata locks. */
thd->mdl_context.release_transactional_locks();
/* release explicit MDL locks */
thd->mdl_context.release_explicit_locks();
if (thd->get_binlog_table_maps())
{
WSREP_DEBUG("clearing binlog table map for BF abort (%ld)", thd->thread_id);
@ -8790,11 +8793,11 @@ static inline wsrep_status_t wsrep_apply_rbr(
DBUG_RETURN(WSREP_FATAL);
}
if (ev->get_type_code() != TABLE_MAP_EVENT &&
if ((ev->get_type_code() == WRITE_ROWS_EVENT ||
ev->get_type_code() == UPDATE_ROWS_EVENT ||
ev->get_type_code() == DELETE_ROWS_EVENT) &&
((Rows_log_event *) ev)->get_flags(Rows_log_event::STMT_END_F))
{
// TODO: combine with commit on higher level common for the query ws
thd->wsrep_rli->cleanup_context(thd, 0);
if (error == 0)