summaryrefslogtreecommitdiff
path: root/storage/ndb/tools
diff options
context:
space:
mode:
authorunknown <lzhou/zhl@dev3-63.(none)>2007-07-31 15:09:16 +0000
committerunknown <lzhou/zhl@dev3-63.(none)>2007-07-31 15:09:16 +0000
commit44f73d4f102351669d86b62ae1be5380f3d5710e (patch)
tree4dc41d72d3d2c3e7b009e9f1f9fef27538b07ffe /storage/ndb/tools
parent5357be7f3e642e8b8724de7f2db3c852dafa7b0b (diff)
downloadmariadb-git-44f73d4f102351669d86b62ae1be5380f3d5710e.tar.gz
BUG#30134 restore of backup from different endian can work for timestamp column
storage/ndb/tools/restore/Restore.cpp: Convert byte order of timestamp data type
Diffstat (limited to 'storage/ndb/tools')
-rw-r--r--storage/ndb/tools/restore/Restore.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp
index 516dfe24855..8764da7f50c 100644
--- a/storage/ndb/tools/restore/Restore.cpp
+++ b/storage/ndb/tools/restore/Restore.cpp
@@ -607,7 +607,10 @@ RestoreDataIterator::getNextTuple(int & res)
attr_data->size = 4*sz;
//if (m_currentTable->getTableId() >= 2) { ndbout << "fix i=" << i << " off=" << ptr-buf_ptr << " attrId=" << attrId << endl; }
-
+ if(!m_hostByteOrder
+ && attr_desc->m_column->getType() == NdbDictionary::Column::Timestamp)
+ attr_data->u_int32_value[0] = Twiddle32(attr_data->u_int32_value[0]);
+
if(!Twiddle(attr_desc, attr_data))
{
res = -1;