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

[justin.he]

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, 2007-04-12 14:41:50+08:00, Justin.He@stripped +3 -0
  Bug#21440 5.1 API connecting to 5.0 cluster doesn't get any error(miss hb in cluster
log)
  correct compatibility check for version between mgmapi and mgmsrv
  improve something for testcase

  ndb/src/common/util/version.c@stripped, 2007-04-12 14:41:48+08:00,
Justin.He@stripped +10 -2
    correct version compatibility check

  ndb/src/mgmsrv/Services.cpp@stripped, 2007-04-12 14:41:48+08:00,
Justin.He@stripped +12 -0
    if not compatible, output err info to log and console

  ndb/src/ndbapi/ndb_cluster_connection.cpp@stripped, 2007-04-12 14:41:48+08:00,
Justin.He@stripped +4 -2
    add check verbose when ndbout err info

# 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:	dev3-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.0/bug21440-5.0-ndb-bj

--- 1.24/ndb/src/common/util/version.c	2007-04-12 14:41:56 +08:00
+++ 1.25/ndb/src/common/util/version.c	2007-04-12 14:41:56 +08:00
@@ -81,9 +81,13 @@
     Uint32 _v1,_v2,_v3;
     if (sscanf(buf, "%u.%u.%u", &_v1, &_v2, &_v3) == 3) {
       ndbOwnVersionTesting = MAKE_VERSION(_v1,_v2,_v3);
+#ifdef TEST_VERSION
       ndbout_c("Testing: Version set to 0x%x",  ndbOwnVersionTesting);
+#endif
     }
   }
+  else
+    ndbOwnVersionTesting = 0;
 }
 #else
 void ndbSetOwnVersion() {}
@@ -182,10 +186,14 @@
 int
 ndbCompatible(Uint32 ownVersion, Uint32 otherVersion, struct NdbUpGradeCompatible
table[])
 {
-  if (otherVersion >= ownVersion) {
+  if (otherVersion > ownVersion) {
+    return 0;
+  }
+  else if (otherVersion == ownVersion) {
     return 1;
   }
-  return ndbSearchUpgradeCompatibleTable(ownVersion, otherVersion, table);
+  else
+    return ndbSearchUpgradeCompatibleTable(ownVersion, otherVersion, table);
 }
 
 int

--- 1.77/ndb/src/mgmsrv/Services.cpp	2007-04-12 14:41:56 +08:00
+++ 1.78/ndb/src/mgmsrv/Services.cpp	2007-04-12 14:41:56 +08:00
@@ -447,6 +447,16 @@
     return;
   }
 
+  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;
+  }
+  
   struct sockaddr_in addr;
   SOCKET_SIZE_TYPE addrlen= sizeof(addr);
   int r = getpeername(m_socket, (struct sockaddr*)&addr, &addrlen);
@@ -559,6 +569,8 @@
       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;
     }
   }  

--- 1.40/ndb/src/ndbapi/ndb_cluster_connection.cpp	2007-04-12 14:41:56 +08:00
+++ 1.41/ndb/src/ndbapi/ndb_cluster_connection.cpp	2007-04-12 14:41:56 +08:00
@@ -553,12 +553,14 @@
     DBUG_RETURN(0);
   } while(0);
   
-  ndbout << "Configuration error: ";
+  if(verbose)
+    ndbout << "Configuration error: ";
   const char* erString = m_impl.m_config_retriever->getErrorString();
   if (erString == 0) {
     erString = "No error specified!";
   }
-  ndbout << erString << endl;
+  if(verbose)
+    ndbout << erString << endl;
   DBUG_RETURN(-1);
 }