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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-03-21 11:37:10 +02:00
parent 76cdc1d73e 9394cc8914
commit 5203bc10f1
93 changed files with 3016 additions and 2903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sql/log.cc
View File

@@ -10815,7 +10815,6 @@ maria_declare_plugin(binlog)
maria_declare_plugin_end;
#ifdef WITH_WSREP
#include "wsrep_trans_observer.h"
#include "wsrep_mysqld.h"
IO_CACHE *wsrep_get_trans_cache(THD * thd)
@@ -10838,33 +10837,33 @@ void wsrep_thd_binlog_trx_reset(THD * thd)
/*
todo: fix autocommit select to not call the caller
*/
if (thd_get_ha_data(thd, binlog_hton) != NULL)
binlog_cache_mngr *const cache_mngr=
(binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
if (cache_mngr)
{
binlog_cache_mngr *const cache_mngr=
(binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
if (cache_mngr)
cache_mngr->reset(false, true);
if (!cache_mngr->stmt_cache.empty())
{
cache_mngr->reset(false, true);
if (!cache_mngr->stmt_cache.empty())
{
WSREP_DEBUG("pending events in stmt cache, sql: %s", thd->query());
cache_mngr->stmt_cache.reset();
}
WSREP_DEBUG("pending events in stmt cache, sql: %s", thd->query());
cache_mngr->stmt_cache.reset();
}
}
thd->clear_binlog_table_maps();
DBUG_VOID_RETURN;
}
void thd_binlog_rollback_stmt(THD * thd)
void wsrep_thd_binlog_stmt_rollback(THD * thd)
{
WSREP_DEBUG("thd_binlog_rollback_stmt connection: %llu",
thd->thread_id);
DBUG_ENTER("wsrep_thd_binlog_stmt_rollback");
WSREP_DEBUG("wsrep_thd_binlog_stmt_rollback");
binlog_cache_mngr *const cache_mngr=
(binlog_cache_mngr*) thd_get_ha_data(thd, binlog_hton);
if (cache_mngr)
cache_mngr->trx_cache.set_prev_position(MY_OFF_T_UNDEF);
{
thd->binlog_remove_pending_rows_event(TRUE, TRUE);
cache_mngr->stmt_cache.reset();
}
DBUG_VOID_RETURN;
}
bool wsrep_stmt_rollback_is_safe(THD* thd)