Skip to content

MDEV-39241: THD::backup_commit_lock warning dangling-pointer #4891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grooverdan wants to merge 1 commit into
base: 10.11
Choose a base branch
from
Open

MDEV-39241: THD::backup_commit_lock warning dangling-pointer #4891

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions sql/xa.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,13 @@ static bool trans_xa_get_backup_lock(THD *thd, MDL_request *mdl_request)
DBUG_ASSERT(thd->backup_commit_lock == 0);
MDL_REQUEST_INIT(mdl_request, MDL_key::BACKUP, "", "", MDL_BACKUP_COMMIT,
MDL_EXPLICIT);
if (thd->mdl_context.acquire_lock(mdl_request,
if (mdl_request &&
thd->mdl_context.acquire_lock(mdl_request,
thd->variables.lock_wait_timeout))
{
mdl_request->~MDL_request();;
return 1;
}
thd->backup_commit_lock= mdl_request;
return 0;
}
Expand All @@ -536,6 +540,7 @@ static inline void trans_xa_release_backup_lock(THD *thd)
if (thd->backup_commit_lock)
{
thd->mdl_context.release_lock(thd->backup_commit_lock->ticket);
thd->backup_commit_lock->~MDL_request();;
thd->backup_commit_lock= 0;
}
}
Expand Down Expand Up @@ -563,11 +568,11 @@ bool trans_xa_prepare(THD *thd)
my_error(ER_XAER_NOTA, MYF(0));
else
{
MDL_request mdl_request;
if (trans_xa_get_backup_lock(thd, &mdl_request) ||
MDL_request *mdl_request= new (thd->mem_root) MDL_request;
if (trans_xa_get_backup_lock(thd, mdl_request) ||
ha_prepare(thd))
{
if (!mdl_request.ticket)
if (!mdl_request->ticket)
/* Failed to get the backup lock */
ha_rollback_trans(thd, TRUE);
thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_BINLOG_THIS_TRX);
Expand Down Expand Up @@ -652,7 +657,6 @@ bool trans_xa_commit(THD *thd)
if (auto xs= xid_cache_search(thd, thd->lex->xid))
{
bool xid_deleted= false;
MDL_request mdl_request;
bool rw_trans= (xs->rm_error != ER_XA_RBROLLBACK);

if (rw_trans && thd->is_read_only_ctx())
Expand All @@ -662,7 +666,7 @@ bool trans_xa_commit(THD *thd)
goto _end_external_xid;
}
res= xa_trans_rolled_back(xs);
if (trans_xa_get_backup_lock(thd, &mdl_request))
if (trans_xa_get_backup_lock(thd, new (thd->mem_root) MDL_request))
{
/*
We can't rollback an XA transaction on lock failure due to
Expand Down Expand Up @@ -720,14 +724,13 @@ bool trans_xa_commit(THD *thd)
else if (thd->transaction->xid_state.xid_cache_element->xa_state ==
XA_PREPARED)
{
MDL_request mdl_request;
if (thd->lex->xa_opt != XA_NONE)
{
my_error(ER_XAER_INVAL, MYF(0));
DBUG_RETURN(TRUE);
}

if (trans_xa_get_backup_lock(thd, &mdl_request))
if (trans_xa_get_backup_lock(thd, new (thd->mem_root) MDL_request))
{
/*
We can't rollback an XA transaction on lock failure due to
Expand Down Expand Up @@ -792,7 +795,6 @@ bool trans_xa_commit(THD *thd)
bool trans_xa_rollback(THD *thd)
{
XID_STATE &xid_state= thd->transaction->xid_state;
MDL_request mdl_request;
bool error;
DBUG_ENTER("trans_xa_rollback");

Expand Down Expand Up @@ -823,7 +825,7 @@ bool trans_xa_rollback(THD *thd)
goto _end_external_xid;
}

if (trans_xa_get_backup_lock(thd, &mdl_request))
if (trans_xa_get_backup_lock(thd, new (thd->mem_root) MDL_request))
{
/*
We can't rollback an XA transaction on lock failure due to
Expand Down Expand Up @@ -867,7 +869,7 @@ bool trans_xa_rollback(THD *thd)
DBUG_RETURN(TRUE);
}

if (trans_xa_get_backup_lock(thd, &mdl_request))
if (trans_xa_get_backup_lock(thd, new (thd->mem_root) MDL_request))
{
/*
We can't rollback an XA transaction on lock failure due to
Expand Down