database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Post-merge fix

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-04-21 13:22:08 -04:00
parent 3331d4e07e
commit e69fbd4e38
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/log.cc
View File

@@ -569,7 +569,15 @@ void thd_binlog_trx_reset(THD * thd)
{
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)
{
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();
}
}
}
thd->clear_binlog_table_maps();
}

8
sql/wsrep_hton.cc
View File

@@ -99,6 +99,14 @@ void wsrep_register_hton(THD* thd, bool all)
*/
void wsrep_post_commit(THD* thd, bool all)
{
/*
TODO: It can perhaps be fixed in a more elegant fashion by turning off
wsrep_emulate_binlog if wsrep_on=0 on server start.
https://github.com/codership/mysql-wsrep/issues/112
*/
if (!WSREP_ON)
return;
switch (thd->wsrep_exec_mode)
{
case LOCAL_COMMIT: