Merge trift2.:/MySQL/M51/ndb-decl-5.1

into trift2.:/MySQL/M51/push-5.1

Merge trift2.:/MySQL/M51/ndb-decl-5.1
into trift2.:/MySQL/M51/push-5.1
2db55bf9 · joerg@trift2 · e2b25204 · 485a656d · 2db55bf9
Commit 2db55bf9 authored Mar 27, 2008 by joerg@trift2
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

storage/ndb/include/ndb_version.h.in storage/ndb/include/ndb_version.h.in +3 -2

No files found.
--- 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)