merge to update with latest mysql-5.1-bugteam

BUILD/check-cpu

@@ -70,6 +70,11 @@ check_cpu () {
     Alpha*EV6*)
       cpu_arg="ev6";
       ;;
+    #Core 2 Duo  
+    *Intel*Core\(TM\)2*)
+      cpu_arg="nocona"
+      core2="yes"
+      ;;
     # Intel ia32
     *Intel*Core*|*X[eE][oO][nN]*)
       # a Xeon is just another pentium4 ...
@@ -134,10 +139,6 @@ check_cpu () {
     *i386*)
       cpu_arg="i386"
       ;;
-    #Core 2 Duo  
-    *Intel*Core\(TM\)2*)
-      cpu_arg="nocona"
-      ;;
     # Intel ia64
     *Itanium*)
       cpu_arg="itanium"

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -7521,8 +7521,8 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal)
       return;
     }
     releaseSections(signal);
-    
-    DictObject * old_ptr_p = old_ptr_p = get_object(tableName, len);
+
+    DictObject * old_ptr_p = get_object(tableName, len);
     if(old_ptr_p)
       obj_id = old_ptr_p->m_id;
   } else {

storage/ndb/src/mgmsrv/InitConfigFileParser.cpp

@@ -208,11 +208,10 @@ InitConfigFileParser::run_config_rules(Context& ctx)
   ctx.m_config->put("NoOfNodes", nNodes);
 
   char tmpLine[MAX_LINE_LENGTH];
-  BaseString::snprintf(tmpLine, MAX_LINE_LENGTH, "EXTERNAL SYSTEM_");
-  strncat(tmpLine, system, MAX_LINE_LENGTH);
-  strncat(tmpLine, ":NoOfConnections", MAX_LINE_LENGTH);
+  BaseString::snprintf(tmpLine, MAX_LINE_LENGTH,
+                       "EXTERNAL SYSTEM_%s:NoOfConnections", system);
   ctx.m_config->put(tmpLine, nExtConnections);
-  
+
   Config * ret = new Config();
   ret->m_configValues = (struct ndb_mgm_configuration*)ctx.m_configValues.getConfigValues();
   ret->m_oldConfig = ctx.m_config; ctx.m_config = 0;