diff options
| author | unknown <joreland@mysql.com> | 2004-10-05 13:51:32 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-10-05 13:51:32 +0200 |
| commit | e0274db3a0b3cf08a6038b34aee46e61bf2d94a8 (patch) | |
| tree | e403546bc11ff102f310670b7f52152ef874e780 | |
| parent | 7a8336bef5c8ec39c045c1dca90a850d23571760 (diff) | |
| download | mariadb-git-e0274db3a0b3cf08a6038b34aee46e61bf2d94a8.tar.gz | |
Don't need to scan exclusive since keyinfo is sent anyway
| -rw-r--r-- | ndb/test/ndbapi/testBlobs.cpp | 2 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ndb/test/ndbapi/testBlobs.cpp b/ndb/test/ndbapi/testBlobs.cpp index e18f4a8bd1a..41bb82f3e06 100644 --- a/ndb/test/ndbapi/testBlobs.cpp +++ b/ndb/test/ndbapi/testBlobs.cpp @@ -1030,7 +1030,7 @@ readScan(int style, bool idx) } else { 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); if (g_opt.m_pk2len != 0) CHK(g_ops->getValue("PK2", tup.m_pk2) != 0); diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index e22d998decc..685dd50e128 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -827,10 +827,7 @@ int ha_ndbcluster::get_ndb_lock_type(enum thr_lock_type type) if (type == TL_WRITE_ALLOW_WRITE) return NdbOperation::LM_Exclusive; else if (uses_blob_value(retrieve_all_fields)) - /* - TODO use a new scan mode to read + lock + keyinfo - */ - return NdbOperation::LM_Exclusive; + return NdbOperation::LM_Read; else return NdbOperation::LM_CommittedRead; } |