diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-03-02 09:38:03 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-03-02 09:38:03 +0700 |
| commit | bd6df52de717e6a39774069e1ca09b3969c74b2b (patch) | |
| tree | da7114aba489983eb2387bb54ecba47a7bc36661 /ndb/tools | |
| parent | 3616b5e3d574de6863cb9aaa6a642ba67401956b (diff) | |
| parent | abc66a6f7f658c85bc0bf3645e61be3ad7e165e5 (diff) | |
| download | mariadb-git-bd6df52de717e6a39774069e1ca09b3969c74b2b.tar.gz | |
Merge poseidon.mysql.com:/home/tomas/mysql-5.0
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
Diffstat (limited to 'ndb/tools')
| -rw-r--r-- | ndb/tools/restore/Restore.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ndb/tools/restore/Restore.cpp b/ndb/tools/restore/Restore.cpp index 9aa79f4dc94..8b2e9a799a4 100644 --- a/ndb/tools/restore/Restore.cpp +++ b/ndb/tools/restore/Restore.cpp @@ -54,7 +54,12 @@ BackupFile::Twiddle(const AttributeDesc* attr_desc, AttributeData* attr_data, Ui return true; case 64: for(i = 0; i<arraySize; i++){ - attr_data->u_int64_value[i] = Twiddle64(attr_data->u_int64_value[i]); + // allow unaligned + char* p = (char*)&attr_data->u_int64_value[i]; + Uint64 x; + memcpy(&x, p, sizeof(Uint64)); + x = Twiddle64(x); + memcpy(p, &x, sizeof(Uint64)); } return true; default: |