diff options
| author | joerg@trift2. <> | 2008-03-27 13:20:24 +0100 |
|---|---|---|
| committer | joerg@trift2. <> | 2008-03-27 13:20:24 +0100 |
| commit | 2db55bf938dad1092d723329338264f1e0f7457e (patch) | |
| tree | 47760c8689d079aa5b173ef4ef59cd7033a7bca7 /storage/ndb | |
| parent | e2b2520450bd51d9f938ddb0be51f045f28a609a (diff) | |
| parent | 485a656df89d6c570b2ccfc0c660557549670a0b (diff) | |
| download | mariadb-git-2db55bf938dad1092d723329338264f1e0f7457e.tar.gz | |
Merge trift2.:/MySQL/M51/ndb-decl-5.1
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/include/ndb_version.h.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/ndb/include/ndb_version.h.in b/storage/ndb/include/ndb_version.h.in index 6a479433b3b..97072315521 100644 --- a/storage/ndb/include/ndb_version.h.in +++ b/storage/ndb/include/ndb_version.h.in @@ -103,11 +103,12 @@ inline int ndb_check_prep_copy_frag_version(Uint32 version) { + const Uint32 major = (version >> 16) & 0xFF; + const Uint32 minor = (version >> 8) & 0xFF; + if (version == NDB_VERSION_D) return 2; - const Uint32 major = (version >> 16) & 0xFF; - const Uint32 minor = (version >> 8) & 0xFF; if (major >= 6) { if (minor == 2) |