1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

Browse Source 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
This commit is contained in:
tomas@whalegate.ndb.mysql.com 2007-03-26 20:57:10 +02:00
commit d4982247cf
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sql/ha_ndbcluster.cc
View File

@ -733,10 +733,9 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field,
DBUG_PRINT("info", ("bit field"));
DBUG_DUMP("value", (char*)&bits, pack_len);
#ifdef WORDS_BIGENDIAN
if (pack_len < 5)
{
DBUG_RETURN(ndb_op->setValue(fieldnr, ((char*)&bits)+4) != 0);
}
/* store lsw first */
bits = ((bits >> 32) & 0x00000000FFFFFFFF)
| ((bits << 32) & 0xFFFFFFFF00000000);
#endif
DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits) != 0);
}
@ -3155,10 +3154,21 @@ void ndb_unpack_record(TABLE *table, NdbValue *value,
else
{
DBUG_PRINT("info", ("bit field H'%.8X%.8X",
*(Uint32*) (*value).rec->aRef(),
*((Uint32*) (*value).rec->aRef()+1)));
field_bit->Field_bit::store((longlong) (*value).rec->u_64_value(),
TRUE);
*(Uint32 *)(*value).rec->aRef(),
*((Uint32 *)(*value).rec->aRef()+1)));
#ifdef WORDS_BIGENDIAN
/* lsw is stored first */
Uint32 *buf= (Uint32 *)(*value).rec->aRef();
((Field_bit *) *field)->store((((longlong)*buf)
& 0x000000000FFFFFFFF)
|
((((longlong)*(buf+1)) << 32)
& 0xFFFFFFFF00000000),
TRUE);
#else
((Field_bit *) *field)->store((longlong)
(*value).rec->u_64_value(), TRUE);
#endif
}
/*
Move back internal field pointer to point to original

7
storage/ndb/include/ndbapi/NdbRecAttr.hpp
View File

@ -305,10 +305,7 @@ inline
Int32
NdbRecAttr::medium_value() const
{
Uint32 tmp = *(Uint32*)theRef;
if (tmp & (0x1<<23))
tmp|= (0xFF<<24);
return (Int32)tmp;
return sint3korr((unsigned char *)theRef);
}
inline
@ -336,7 +333,7 @@ inline
Uint32
NdbRecAttr::u_medium_value() const
{
return *(Uint32*)theRef;
return uint3korr((unsigned char*)theRef);
}
inline

23
storage/ndb/src/ndbapi/NdbRecAttr.cpp
View File

@ -234,24 +234,13 @@ ndbrecattr_print_formatted(NdbOut& out, const NdbRecAttr &r,
break;
case NdbDictionary::Column::Bit:
out << f.hex_prefix << "0x";
if (length < 33)
{
out.print("%X", r.u_32_value());
}
else if (length < 65)
{
out.print("%llX", r.u_64_value());
}
else
{
const unsigned char *buf = (unsigned char *)r.aRef();
int k = 4*((length+31)/32);
while (k > 0 && (*(buf + --k) == 0));
do
{
out.print("%X", (Uint32)*(buf + k--));
}
while (k >= 0);
const Uint32 *buf = (Uint32 *)r.aRef();
int k = (length+31)/32;
while (k > 0 && (buf[--k] == 0));
out.print("%X", buf[k]);
while (k > 0)
out.print("%.8X", buf[--k]);
}
break;
case NdbDictionary::Column::Unsigned:

2
storage/ndb/test/src/NDBT_Table.cpp
View File

@ -33,7 +33,7 @@ operator <<(class NdbOut& ndbout, const NDBT_Table & tab)
ndbout << "Length of frm data: " << tab.getFrmLength() << endl;
ndbout << "Row Checksum: " << tab.getRowChecksumIndicator() << endl;
ndbout << "Row GCI: " << tab.getRowGCIIndicator() << endl;
ndbout << "SingleUserMode: " << tab.getSingleUserMode() << endl;
ndbout << "SingleUserMode: " << (Uint32) tab.getSingleUserMode() << endl;
//<< ((tab.getTupleKey() == TupleId) ? " tupleid" : "") <<endl;
ndbout << "TableStatus: ";