mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After-merge fix

Browse source 
Merge a part of commit 25af2a183b.
This was forgotten in the
merge commit e41eb044f1.
This commit is contained in:
Marko Mäkelä 2019-08-29 18:22:41 +03:00
parent e50b2bdbcf
commit d4246e25e5
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/innobase/include/trx0sys.h
View file

@ -644,11 +644,8 @@ public:
{
mutex_enter(&element->mutex);
lf_hash_search_unpin(pins);
trx= element->trx;
if (!trx);
else if (UNIV_UNLIKELY(trx_id != trx->id))
trx= NULL;
else {
if ((trx= element->trx)) {
DBUG_ASSERT(trx_id == trx->id);
if (do_ref_count)
trx->reference();
ut_d(validate_element(trx));