diff options
| author | joreland@mysql.com <> | 2005-01-16 09:55:13 +0100 |
|---|---|---|
| committer | joreland@mysql.com <> | 2005-01-16 09:55:13 +0100 |
| commit | ea1d7c58a196196318436003ba9893c4bf6282a4 (patch) | |
| tree | 31ad2e4b6a9043799da3a40c4d08e6c1eefe8a35 /ndb | |
| parent | 0dc477c58b9983f893da2cb55385042d7b7588b9 (diff) | |
| download | mariadb-git-ea1d7c58a196196318436003ba9893c4bf6282a4.tar.gz | |
ndb - fix bugs into test framework (updates values for pk's)
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/test/src/HugoCalculator.cpp | 5 | ||||
| -rw-r--r-- | ndb/test/src/HugoOperations.cpp | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ndb/test/src/HugoCalculator.cpp b/ndb/test/src/HugoCalculator.cpp index 77821870754..aef81501ea0 100644 --- a/ndb/test/src/HugoCalculator.cpp +++ b/ndb/test/src/HugoCalculator.cpp @@ -98,7 +98,7 @@ HugoCalculator::calcValue(int record, if (attr->getPrimaryKey()) { - srand(record + attrib + updates); + srand(record + attrib); val = (record + attrib); } else @@ -198,12 +198,11 @@ HugoCalculator::verifyRowValues(NDBT_ResultRow* const pRow) const{ } } else{ if (memcmp(res, pRow->attributeStore(i)->aRef(), len) != 0){ - // if (memcmp(res, pRow->attributeStore(i)->aRef(), pRow->attributeStore(i)->getLength()) != 0){ g_err << "Column: " << attr->getName() << endl; const char* buf2 = pRow->attributeStore(i)->aRef(); for (Uint32 j = 0; j < len; j++) { - g_err << j << ":" << hex << (int)buf[j] << "[" << hex << (int)buf2[j] << "]"; + g_err << j << ":" << hex << (Uint32)(Uint8)buf[j] << "[" << hex << (Uint32)(Uint8)buf2[j] << "]"; if (buf[j] != buf2[j]) { g_err << "==>Match failed!"; diff --git a/ndb/test/src/HugoOperations.cpp b/ndb/test/src/HugoOperations.cpp index 959db70ec2e..bdb4013600a 100644 --- a/ndb/test/src/HugoOperations.cpp +++ b/ndb/test/src/HugoOperations.cpp @@ -177,7 +177,11 @@ HugoOperations::setValues(NdbOperation* pOp, int rowId, int updateId) ERR(pTrans->getNdbError()); return NDBT_FAILED; } - } else { + } + } + + for(a = 0; a<tab.getNoOfColumns(); a++){ + if (tab.getColumn(a)->getPrimaryKey() == false){ if(setValueForAttr(pOp, a, rowId, updateId ) != 0){ ERR(pTrans->getNdbError()); return NDBT_FAILED; |