mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
ndb, transaction should be refgistred even if m_transaction_on is not set
This commit is contained in:
parent
3f6671d72a
commit
c445b29d4d
1 changed files with 2 additions and 4 deletions
|
@ -3288,8 +3288,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
|
||||||
ERR_RETURN(ndb->getNdbError());
|
ERR_RETURN(ndb->getNdbError());
|
||||||
no_uncommitted_rows_reset(thd);
|
no_uncommitted_rows_reset(thd);
|
||||||
thd_ndb->stmt= trans;
|
thd_ndb->stmt= trans;
|
||||||
if (m_transaction_on)
|
trans_register_ha(thd, FALSE, &ndbcluster_hton);
|
||||||
trans_register_ha(thd, FALSE, &ndbcluster_hton);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -3304,8 +3303,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
|
||||||
ERR_RETURN(ndb->getNdbError());
|
ERR_RETURN(ndb->getNdbError());
|
||||||
no_uncommitted_rows_reset(thd);
|
no_uncommitted_rows_reset(thd);
|
||||||
thd_ndb->all= trans;
|
thd_ndb->all= trans;
|
||||||
if (m_transaction_on)
|
trans_register_ha(thd, TRUE, &ndbcluster_hton);
|
||||||
trans_register_ha(thd, TRUE, &ndbcluster_hton);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
If this is the start of a LOCK TABLE, a table look
|
If this is the start of a LOCK TABLE, a table look
|
||||||
|
|
Loading…
Add table
Reference in a new issue