bk commit into 5.0 tree (Justin.He:1.2253) BUG#21440

[jhe]

Below is the list of changes that have just been committed into a local
5.0 repository of justin.he. When justin.he does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-29 16:03:44+08:00, Justin.He@stripped +2 -0
  BUG #21440, 5.1 API connecting to 5.0 cluster doesn't get any error(miss hb in cluter log)

  ndb/src/common/util/version.c@stripped, 2006-08-29 16:03:39+08:00, Justin.He@stripped +5 -2
    if ndb5.1 api connect to ndb5.0 mgmd, it will be failed, so change the version 
    compatibility to equal, that means the client& server's major&minor version must 
    be equal.

  ndb/src/mgmsrv/Services.cpp@stripped, 2006-08-29 16:03:39+08:00, Justin.He@stripped +4 -2
    remove #if and  #endif, to recover the version compatibility checking error message,
    and add log message.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Justin.He
# Host:	qa3-104.qa.cn.tlan
# Root:	/mnt/sda7/justin.he/mysql/bug21440-mysql-5.0-ndb-bj

--- 1.23/ndb/src/common/util/version.c	2006-08-29 16:03:58 +08:00
+++ 1.24/ndb/src/common/util/version.c	2006-08-29 16:03:58 +08:00
@@ -183,10 +183,13 @@
 int
 ndbCompatible(Uint32 ownVersion, Uint32 otherVersion, struct NdbUpGradeCompatible table[])
 {
-  if (otherVersion >= ownVersion) {
+  //if (otherVersion >= ownVersion) {
+  if (getMajor(otherVersion) == getMajor(ownVersion)  
+      && getMinor(otherVersion) == getMinor(ownVersion)) {
     return 1;
   }
-  return ndbSearchUpgradeCompatibleTable(ownVersion, otherVersion, table);
+  return 0;
+  //return ndbSearchUpgradeCompatibleTable(ownVersion, otherVersion, table);
 }
 
 int

--- 1.69/ndb/src/mgmsrv/Services.cpp	2006-08-29 16:03:58 +08:00
+++ 1.70/ndb/src/mgmsrv/Services.cpp	2006-08-29 16:03:58 +08:00
@@ -537,15 +537,17 @@
     }
   }    
   
-#if 0
+//#if 0
   if (!compatible){
     m_output->println(cmd);
     m_output->println("result: incompatible version mgmt 0x%x and node 0x%x",
 		      NDB_VERSION, version);
     m_output->println("");
+    g_eventLogger.warning("incompatible version mgmt 0x%x and node 0x%x",
+		      NDB_VERSION, version);
     return;
   }
-#endif
+//#endif
   
   m_output->println(cmd);
   m_output->println("nodeid: %u", tmp);