diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-03-13 09:36:39 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-03-13 09:36:39 +0100 |
| commit | e942172ed840d206c5c623e0c18c647c5af0a9c8 (patch) | |
| tree | f4cf3808bd0df6aa222d4624071b2b1683f37bbb /storage/ndb | |
| parent | e01fbd7246cadf173a8b30786fc129e43d418ca5 (diff) | |
| parent | 142eb227d814d9443f164f4b1ee8e08d65dc1863 (diff) | |
| download | mariadb-git-e942172ed840d206c5c623e0c18c647c5af0a9c8.tar.gz | |
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
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index 9e8b414f572..4d2988fd930 100644 --- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -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 || |