Commit 2db55bf9 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

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

into  trift2.:/MySQL/M51/push-5.1
parents e2b25204 485a656d

storage/ndb/include/ndb_version.h.in

+3 −2
Original line number Diff line number Diff line
@@ -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)