Skip to content

M
MariaDB
Commit c445b29d authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com
Browse files
Options

ndb, transaction should be refgistred even if m_transaction_on is not set

parent 3f6671d7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
sql/ha_ndbcluster.cc
View file @ c445b29d
...@@ -3288,8 +3288,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) ...@@ -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) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7