Commit e942172e authored by unknown's avatar unknown

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
parents e01fbd72 142eb227
...@@ -6704,10 +6704,6 @@ void Dblqh::execACCKEYREF(Signal* signal) ...@@ -6704,10 +6704,6 @@ void Dblqh::execACCKEYREF(Signal* signal)
* *
* -> ZNO_TUPLE_FOUND is possible * -> ZNO_TUPLE_FOUND is possible
*/ */
ndbrequire(tcPtr->operation == ZREAD
|| tcPtr->operation == ZREAD_EX
|| tcPtr->seqNoReplica == 0);
ndbrequire ndbrequire
(tcPtr->seqNoReplica == 0 || (tcPtr->seqNoReplica == 0 ||
errCode != ZTUPLE_ALREADY_EXIST || errCode != ZTUPLE_ALREADY_EXIST ||
......
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