bk commit into 5.1 tree (tomas:1.2569) BUG#30134

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-23 15:17:44+02:00, tomas@stripped +1 -0
  BUG#30134 restore of backup from different endian can work for timestamp column
  (recommit for 5.1.22 target)

  storage/ndb/tools/restore/Restore.cpp@stripped, 2007-08-23 15:17:42+02:00,
tomas@stripped +4 -1
    Convert byte order of timestamp data type

diff -Nrup a/storage/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp
--- a/storage/ndb/tools/restore/Restore.cpp	2007-06-05 18:00:27 +02:00
+++ b/storage/ndb/tools/restore/Restore.cpp	2007-08-23 15:17:42 +02:00
@@ -607,7 +607,10 @@ RestoreDataIterator::getNextTuple(int  &
     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;