Commit c0f5b574 authored by lzhou/zhl@dev3-63.(none)'s avatar lzhou/zhl@dev3-63.(none)

Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27543
parents 53c2c7fa b2b22e93
...@@ -681,6 +681,17 @@ RestoreDataIterator::getNextTuple(int & res) ...@@ -681,6 +681,17 @@ RestoreDataIterator::getNextTuple(int & res)
memcpy(p, &x, sizeof(Uint64)); memcpy(p, &x, sizeof(Uint64));
} }
//convert datetime type
if(!m_hostByteOrder
&& attr_desc->m_column->getType() == NdbDictionary::Column::Datetime)
{
char* p = (char*)&attr_data->u_int64_value[0];
Uint64 x;
memcpy(&x, p, sizeof(Uint64));
x = Twiddle64(x);
memcpy(p, &x, sizeof(Uint64));
}
if(!Twiddle(attr_desc, attr_data, attr_desc->arraySize)) if(!Twiddle(attr_desc, attr_data, attr_desc->arraySize))
{ {
res = -1; res = -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment