MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:lzhou Date:August 30 2007 10:48am
Subject:bk commit into 5.1 tree (lzhou:1.2587)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of zhl. When zhl 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-30 10:48:36+00:00, lzhou@dev3-63.(none) +1 -0
  Merge dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30024
  into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/test
  MERGE: 1.2520.1.3

  storage/ndb/tools/restore/Restore.cpp@stripped, 2007-08-30 10:48:17+00:00, lzhou@dev3-63.(none) +0 -0
    Auto merged
    MERGE: 1.51.1.2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lzhou
# Host:	dev3-63.(none)
# Root:	/home/zhl/mysql/mysql-5.1/test/RESYNC

--- 1.52/storage/ndb/tools/restore/Restore.cpp	2007-08-30 10:48:56 +00:00
+++ 1.53/storage/ndb/tools/restore/Restore.cpp	2007-08-30 10:48:56 +00: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;
Thread
bk commit into 5.1 tree (lzhou:1.2587)lzhou30 Aug