database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2021-07-31 23:19:51 +02:00
parent a49f5525bb 7841a7eb09
commit ae6bdc6769
345 changed files with 7745 additions and 2127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/handler.cc
View File

@ -1686,13 +1686,27 @@ int ha_commit_trans(THD *thd, bool all)
goto err;
}
DBUG_ASSERT(trx_start_id);
#ifdef WITH_WSREP
bool saved_wsrep_on= thd->variables.wsrep_on;
thd->variables.wsrep_on= false;
#endif
TR_table trt(thd, true);
if (trt.update(trx_start_id, trx_end_id))
#ifdef WITH_WSREP
{
thd->variables.wsrep_on= saved_wsrep_on;
#endif
goto err;
#ifdef WITH_WSREP
}
#endif
// Here, the call will not commit inside InnoDB. It is only working
// around closing thd->transaction.stmt open by TR_table::open().
if (all)
commit_one_phase_2(thd, false, &thd->transaction->stmt, false);
#ifdef WITH_WSREP
thd->variables.wsrep_on= saved_wsrep_on;
#endif
}
}
#endif