bk commit into 5.0 tree (jonas:1.2012)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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
  1.2012 06/04/18 21:51:40 jonas@eel.(none) +8 -0
  ndb -
    New node type for mysqld (in config, in ndbd/ndbapi they are still the same)

  ndb/src/ndbapi/ClusterMgr.cpp
    1.22 06/04/18 21:51:35 jonas@eel.(none) +1 -0
    Add new node type for MYSQLD

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.90 06/04/18 21:51:35 jonas@eel.(none) +1 -1
    Fix printout

  ndb/src/mgmsrv/InitConfigFileParser.cpp
    1.25 06/04/18 21:51:35 jonas@eel.(none) +20 -14
    Add new node type for MYSQLD

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.70 06/04/18 21:51:35 jonas@eel.(none) +2 -1
    Use different values for MYSQLD/NDBAPI

  ndb/src/kernel/vm/Configuration.cpp
    1.40 06/04/18 21:51:35 jonas@eel.(none) +1 -0
    Add new node type for MYSQLD

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.21 06/04/18 21:51:35 jonas@eel.(none) +3 -0
    Add new node type for MYSQLD

  ndb/src/cw/cpcd/Makefile.am
    1.13 06/04/18 21:51:34 jonas@eel.(none) +1 -1
    Always link cpcd static

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.19 06/04/18 21:51:34 jonas@eel.(none) +1 -0
    Add new node type for MYSQLD

# 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:	jonas
# Host:	eel.(none)
# Root:	/home/jonas/src/50-atrt

--- 1.18/ndb/include/mgmapi/mgmapi_config_parameters.h	2005-07-25 13:23:29 +02:00
+++ 1.19/ndb/include/mgmapi/mgmapi_config_parameters.h	2006-04-18 21:51:34 +02:00
@@ -164,6 +164,7 @@
 #define NODE_TYPE_MGM                 2
 #define NODE_TYPE_REP                 3
 #define NODE_TYPE_EXT_REP             4
+#define NODE_TYPE_MYSQLD              5
 
 #define CONNECTION_TYPE_TCP           0
 #define CONNECTION_TYPE_SHM           1

--- 1.69/ndb/src/mgmsrv/ConfigInfo.cpp	2006-04-18 21:27:23 +02:00
+++ 1.70/ndb/src/mgmsrv/ConfigInfo.cpp	2006-04-18 21:51:35 +02:00
@@ -2630,7 +2630,8 @@
   if (ctx.m_currentSection->get("FileSection", &name) &&
       strcmp(name, "MYSQLD") == 0)
   {
-    ctx.m_currentSection->put("SectionType", NODE_TYPE_API);
+    ctx.m_currentSection->put("SectionType", NODE_TYPE_MYSQLD);
+    ndbout_c("changing to MYSQLD");
   }
   return true;
 }

--- 1.24/ndb/src/mgmsrv/InitConfigFileParser.cpp	2006-04-18 21:27:23 +02:00
+++ 1.25/ndb/src/mgmsrv/InitConfigFileParser.cpp	2006-04-18 21:51:35 +02:00
@@ -650,7 +650,7 @@
 	value_int = *(Uint64*)options[i].value;
 	break;
       case GET_STR:
-	ctx.m_currentSection->put(options[i].name, (char*)options[i].value);
+	ctx.m_currentSection->put(options[i].name, *options[i].value);
 	continue;
       default:
 	abort();
@@ -813,6 +813,7 @@
   /**
    * Add ndbd, ndb_mgmd, api/mysqld
    */
+  Uint32 idx = options.size();
   {
     struct my_option opt;
     bzero(&opt, sizeof(opt));
@@ -822,7 +823,6 @@
     opt.var_type = GET_STR;
     opt.arg_type = REQUIRED_ARG;
     options.push_back(opt);
-    ndbd = &options.back();
 
     opt.name = "ndb_mgmd";
     opt.id = 256;
@@ -830,7 +830,6 @@
     opt.var_type = GET_STR;
     opt.arg_type = REQUIRED_ARG;
     options.push_back(opt);
-    ndb_mgmd = &options.back();
 
     opt.name = "mysqld";
     opt.id = 256;
@@ -838,7 +837,6 @@
     opt.var_type = GET_STR;
     opt.arg_type = REQUIRED_ARG;
     options.push_back(opt);
-    mysqld = &options.back();
 
     opt.name = "api";
     opt.id = 256;
@@ -846,12 +844,15 @@
     opt.var_type = GET_STR;
     opt.arg_type = REQUIRED_ARG;
     options.push_back(opt);
-    api = &options.back();
 
     bzero(&opt, sizeof(opt));
     options.push_back(opt);
+    ndbd = &options[idx];
+    ndb_mgmd = &options[idx+1];
+    mysqld = &options[idx+2];
+    api = &options[idx+3];
   }
-
+  
   
   Context ctx(m_info, m_errstream); 
   const char *groups[]= { "cluster_config", 0 };
@@ -865,14 +866,19 @@
     goto end;
   if(!handle_mycnf_defaults(options, ctx, "MGM"))
     goto end;
-
+  
   {
-    struct sect { struct my_option* src; const char * name; } sections[] = 
+    struct sect 
+    { 
+      struct my_option* src; 
+      const char * name; 
+      const char * real_name;
+    } sections[] = 
       {
-	{ ndb_mgmd, "MGM" }
-	,{ ndbd, "DB" }
-	,{ mysqld, "API" }
-	,{ api, "API" }
+	{ ndb_mgmd, "MGM", "MGM" }
+	,{ ndbd, "DB", "DB" }
+	,{ mysqld, "API", "MYSQLD" }
+	,{ api, "API", "API" }
 	,{ 0, 0 }, { 0, 0 }
       };
     
@@ -920,8 +926,8 @@
 	  require((ctx.m_currentInfo = m_info->getInfo(ctx.fname)) != 0);
 	  require((ctx.m_systemDefaults = m_info->getDefaults(ctx.fname))!= 0);
 	  ctx.m_currentSection->put("HostName", list[j].c_str());
-	  if(!load_mycnf_groups(options, ctx, sections[i].name, 
-				defaults_groups))
+	  ctx.m_currentSection->put("FileSection", sections[i].real_name);
+	  if(!load_mycnf_groups(options, ctx, ctx.fname, defaults_groups))
 	    goto end;
 	  
 	  if(!storeSection(ctx))

--- 1.20/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2005-08-18 14:09:05 +02:00
+++ 1.21/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2006-04-18 21:51:35 +02:00
@@ -119,6 +119,9 @@
     case NodeInfo::MGM:
     case NodeInfo::REP:
       break;
+    case NODE_TYPE_MYSQLD:
+      nodeType = NodeInfo::API;
+      break;
     default:
       ndbrequire(false);
     }

--- 1.39/ndb/src/kernel/vm/Configuration.cpp	2005-03-01 09:53:47 +01:00
+++ 1.40/ndb/src/kernel/vm/Configuration.cpp	2006-04-18 21:51:35 +02:00
@@ -565,6 +565,7 @@
 	ERROR_SET(fatal, ERR_INVALID_CONFIG, msg, buf);
       }
       break;
+    case NODE_TYPE_MYSQLD:
     case NODE_TYPE_API:
       noOfAPINodes++; // No of API processes
       break;

--- 1.89/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-09-30 12:27:35 +02:00
+++ 1.90/ndb/src/mgmsrv/MgmtSrvr.cpp	2006-04-18 21:51:35 +02:00
@@ -2283,7 +2283,7 @@
       break;
     case 1:
       res = i2.set(param, val_64);
-      ndbout_c("Updating node %d param: %d to %Ld",  node, param, val_32);
+      ndbout_c("Updating node %d param: %d to %Ld",  node, param, val_64);
       break;
     case 2:
       res = i2.set(param, val_char);

--- 1.21/ndb/src/ndbapi/ClusterMgr.cpp	2005-07-22 12:29:15 +02:00
+++ 1.22/ndb/src/ndbapi/ClusterMgr.cpp	2006-04-18 21:51:35 +02:00
@@ -104,6 +104,7 @@
       theNodes[tmp].m_info.m_type = NodeInfo::DB;
       break;
     case NODE_TYPE_API:
+    case NODE_TYPE_MYSQLD:
       theNodes[tmp].m_info.m_type = NodeInfo::API;
       break;
     case NODE_TYPE_MGM:

--- 1.12/ndb/src/cw/cpcd/Makefile.am	2004-11-11 21:25:32 +01:00
+++ 1.13/ndb/src/cw/cpcd/Makefile.am	2006-04-18 21:51:34 +02:00
@@ -12,7 +12,7 @@
 include $(top_srcdir)/ndb/config/common.mk.am
 include $(top_srcdir)/ndb/config/type_util.mk.am
 
-ndb_cpcd_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%