mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

Browse source 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
This commit is contained in:
unknown 2005-01-16 09:58:41 +01:00
commit 41c1a6c658
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ndb/test/src/HugoCalculator.cpp
View file

@ -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!";

6
ndb/test/src/HugoOperations.cpp
View file

@ -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;