diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-10-19 09:38:37 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-10-19 09:38:37 +0200 |
| commit | 6134c072588b28dca5fa8766b9dc434fb78452d6 (patch) | |
| tree | 6955e753550152b5ebaa987e3b1c258e9134838d /sql/ha_ndbcluster.cc | |
| parent | 46152464aa27954659a028d625f82acc601b7bbe (diff) | |
| parent | d262020f44988305f45519b21d3568fad0eb6b9a (diff) | |
| download | mariadb-git-6134c072588b28dca5fa8766b9dc434fb78452d6.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index e9e2103cba7..a410ff1f218 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -1595,7 +1595,9 @@ int ha_ndbcluster::peek_indexed_rows(const byte *record) int res; DBUG_ENTER("peek_indexed_rows"); - NdbOperation::LockMode lm= NdbOperation::LM_Read; + NdbOperation::LockMode lm= + (NdbOperation::LockMode)get_ndb_lock_type(m_lock.type); + first= NULL; if (table->s->primary_key != MAX_KEY) { |