diff options
| author | unknown <joerg@trift2.> | 2007-08-24 12:28:47 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-24 12:28:47 +0200 |
| commit | fa91482f61768bbc9009058674c2458e884bb499 (patch) | |
| tree | ca9288e02ecbc852f4223f8589dffc5d0bf1938f /storage | |
| parent | 420c80dd817d5c2c3974844de4d2dd1f5ddc8f79 (diff) | |
| parent | a59096c5547d65ca120abfafc84efe9b4c8e5690 (diff) | |
| download | mariadb-git-fa91482f61768bbc9009058674c2458e884bb499.tar.gz | |
Merge trift2.:/MySQL/M51/tmp-5.1
into trift2.:/MySQL/M51/push-5.1
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/tools/restore/Restore.cpp | 5 |
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; |