Commit 0d11c2c1 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

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

into  perch.ndb.mysql.com:/home/jonas/src/51-new
parents 45faa21a 4d436c32
...@@ -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