Commit e942172e authored by unknown's avatar unknown
Browse files

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

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+0 −4
Original line number Diff line number Diff line
@@ -6704,10 +6704,6 @@ void Dblqh::execACCKEYREF(Signal* signal) 
     *

     * -> ZNO_TUPLE_FOUND is possible

     */

    ndbrequire(tcPtr->operation == ZREAD 

	       || tcPtr->operation == ZREAD_EX

	       || tcPtr->seqNoReplica == 0);

    

    ndbrequire

      (tcPtr->seqNoReplica == 0 ||

       errCode != ZTUPLE_ALREADY_EXIST ||