Commit 4b32a42f authored by unknown's avatar unknown

Don't need to scan exclusive since keyinfo is sent anyway

parent 6fc954ce
...@@ -1030,7 +1030,7 @@ readScan(int style, bool idx) ...@@ -1030,7 +1030,7 @@ readScan(int style, bool idx)
} else { } else {
CHK((g_ops = g_con->getNdbIndexScanOperation(g_opt.m_x2name, g_opt.m_tname)) != 0); CHK((g_ops = g_con->getNdbIndexScanOperation(g_opt.m_x2name, g_opt.m_tname)) != 0);
} }
CHK((rs = g_ops->readTuples(NdbScanOperation::LM_Exclusive)) != 0); CHK((rs = g_ops->readTuples(NdbScanOperation::LM_Read)) != 0);
CHK(g_ops->getValue("PK1", (char*)&tup.m_pk1) != 0); CHK(g_ops->getValue("PK1", (char*)&tup.m_pk1) != 0);
if (g_opt.m_pk2len != 0) if (g_opt.m_pk2len != 0)
CHK(g_ops->getValue("PK2", tup.m_pk2) != 0); CHK(g_ops->getValue("PK2", tup.m_pk2) != 0);
......
...@@ -827,10 +827,7 @@ int ha_ndbcluster::get_ndb_lock_type(enum thr_lock_type type) ...@@ -827,10 +827,7 @@ int ha_ndbcluster::get_ndb_lock_type(enum thr_lock_type type)
if (type == TL_WRITE_ALLOW_WRITE) if (type == TL_WRITE_ALLOW_WRITE)
return NdbOperation::LM_Exclusive; return NdbOperation::LM_Exclusive;
else if (uses_blob_value(retrieve_all_fields)) else if (uses_blob_value(retrieve_all_fields))
/* return NdbOperation::LM_Read;
TODO use a new scan mode to read + lock + keyinfo
*/
return NdbOperation::LM_Exclusive;
else else
return NdbOperation::LM_CommittedRead; return NdbOperation::LM_CommittedRead;
} }
......
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