wl1744 - win compile fixes

ndb/include/kernel/signaldata/RepImpl.hpp:
  more win-compile-fixes
ndb/include/mgmapi/mgmapi.h:
  more win-compile-fixes
ndb/include/ndbapi/NdbConnection.hpp:
  more win-compile-fixes
ndb/src/common/util/Properties.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/grep/Grep.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/Config.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbBlob.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbConnection.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbImpl.hpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbOperationExec.cpp:
  more win-compile-fixes
ndb/test/ndbapi/testOperations.cpp:
  more win-compile-fixes
sql/ha_ndbcluster.cc:
  more win-compile-fixes

3 files changed, 33 insertions, 33 deletions

diff --git a/ndb/src/mgmsrv/Config.cpp b/ndb/src/mgmsrv/Config.cpp
index f9c6a23f909..5ff9cbe04ad 100644
--- a/ndb/src/mgmsrv/Config.cpp
+++ b/ndb/src/mgmsrv/Config.cpp
@@ -53,27 +53,27 @@ Config::printAllNameValuePairs(NdbOut &out,
 
     if(!section->contains(n))
       continue;
-    if (m_info.getStatus(section, n) == ConfigInfo::INTERNAL) 
+    if (m_info.getStatus(section, n) == ConfigInfo::CI_INTERNAL) 
       continue;
-    if (m_info.getStatus(section, n) == ConfigInfo::DEPRICATED)
+    if (m_info.getStatus(section, n) == ConfigInfo::CI_DEPRICATED)
       continue;
-    if (m_info.getStatus(section, n) == ConfigInfo::NOTIMPLEMENTED)
+    if (m_info.getStatus(section, n) == ConfigInfo::CI_NOTIMPLEMENTED)
       continue;
 
     out << n << ": ";
 
     switch (m_info.getType(section, n)) {
-    case ConfigInfo::INT:
+    case ConfigInfo::CI_INT:
       MGM_REQUIRE(prop->get(n, &int_value)); 
       out << int_value;
       break;
 
-    case ConfigInfo::INT64:
+    case ConfigInfo::CI_INT64:
       MGM_REQUIRE(prop->get(n, &int_64)); 
       out << int_64;
       break;
       
-    case ConfigInfo::BOOL:
+    case ConfigInfo::CI_BOOL:
       MGM_REQUIRE(prop->get(n, &int_value)); 
       if (int_value) {
 	out << "Y";
@@ -81,11 +81,11 @@ Config::printAllNameValuePairs(NdbOut &out,
 	out << "N";
       }
       break;
-    case ConfigInfo::STRING:
+    case ConfigInfo::CI_STRING:
       MGM_REQUIRE(prop->get(n, &str_value)); 
       out << str_value;
       break;
-    case ConfigInfo::SECTION:
+    case ConfigInfo::CI_SECTION:
       out << "SECTION";
       break;
     }      
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp
index 5f1f0cccb23..0a41db0e044 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -2272,12 +2272,12 @@ ConfigInfo::ConfigInfo()
  * Getters
  ****************************************************************************/
 inline void warning(const char * src, const char * arg){
-  ndbout << "Illegal call to ConfigInfo::CI_" << src << "() - " << arg << endl;
+  ndbout << "Illegal call to ConfigInfo::" << src << "() - " << arg << endl;
   abort();
 }
 
 const Properties * 
-ConfigInfo::CI_getInfo(const char * section) const {
+ConfigInfo::getInfo(const char * section) const {
   const Properties * p;
   if(!m_info.get(section, &p)){
     return 0;
@@ -2391,23 +2391,23 @@ ConfigInfo::getType(const Properties * section, const char* fname) const {
   return (ConfigInfo::Type) getInfoInt(section, fname, "Type");
 }
 
-ConfigInfo::CI_Status
-ConfigInfo::CI_getStatus(const Properties * section, const char* fname) const {
-  return (ConfigInfo::CI_Status) getInfoInt(section, fname, "Status");
+ConfigInfo::Status
+ConfigInfo::getStatus(const Properties * section, const char* fname) const {
+  return (ConfigInfo::Status) getInfoInt(section, fname, "Status");
 }
 
 /****************************************************************************
  * Printers
  ****************************************************************************/
 
-void ConfigInfo::CI_print() const {
+void ConfigInfo::print() const {
   Properties::Iterator it(&m_info);
   for (const char* n = it.first(); n != NULL; n = it.next()) {
     print(n);
   }
 }
 
-void ConfigInfo::CI_print(const char* section) const {
+void ConfigInfo::print(const char* section) const {
   ndbout << "****** " << section << " ******" << endl << endl;
   const Properties * sec = getInfo(section);
   Properties::Iterator it(sec);
@@ -2420,7 +2420,7 @@ void ConfigInfo::CI_print(const char* section) const {
   }
 }
 
-void ConfigInfo::CI_print(const Properties * section, 
+void ConfigInfo::print(const Properties * section, 
 		       const char* parameter) const {
   ndbout << parameter;
   //  ndbout << getDescription(section, parameter) << endl;
@@ -2743,7 +2743,7 @@ applyDefaultValues(InitConfigFileParser::Context & ctx,
     Properties::Iterator it(defaults);
 
     for(const char * name = it.first(); name != NULL; name = it.next()){
-      ConfigInfo::CI_Status st = ctx.m_info->getStatus(ctx.m_currentInfo, name);
+      ConfigInfo::Status st = ctx.m_info->getStatus(ctx.m_currentInfo, name);
       if(!ctx.m_currentSection->contains(name)){
 	switch (ctx.m_info->getType(ctx.m_currentInfo, name)){
 	case ConfigInfo::CI_INT:
@@ -3163,7 +3163,7 @@ transform(InitConfigFileParser::Context & ctx,
   
   PropertiesType oldType;
   require(ctx.m_currentSection->getTypeOf(oldName, &oldType));
-  ConfigInfo::CI_Type newType = ctx.m_info->getType(ctx.m_currentInfo, newName);  
+  ConfigInfo::Type newType = ctx.m_info->getType(ctx.m_currentInfo, newName);  
   if(!((oldType == PropertiesType_Uint32 || oldType == PropertiesType_Uint64) 
        && (newType == ConfigInfo::CI_INT || newType == ConfigInfo::CI_INT64 || newType == ConfigInfo::CI_BOOL))){
     ndbout << "oldType: " << (int)oldType << ", newType: " << (int)newType << endl;
@@ -3326,7 +3326,7 @@ saveInConfigValues(InitConfigFileParser::Context & ctx, const char * data){
 }
 
 static bool
-sanity_checks(Vector<ConfigInfo::CI_ConfigRuleSection>&sections, 
+sanity_checks(Vector<ConfigInfo::ConfigRuleSection>&sections, 
 	      struct InitConfigFileParser::Context &ctx, 
 	      const char * rule_data)
 {
@@ -3349,7 +3349,7 @@ sanity_checks(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
 }
 
 static bool
-add_node_connections(Vector<ConfigInfo::CI_ConfigRuleSection>&sections, 
+add_node_connections(Vector<ConfigInfo::ConfigRuleSection>&sections, 
 		   struct InitConfigFileParser::Context &ctx, 
 		   const char * rule_data)
 {
@@ -3401,7 +3401,7 @@ add_node_connections(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
     for (Uint32 j= i+1;; j++){
       if(!p_db_nodes.get("", j, &nodeId2)) break;
       if(!p_connections2.get("", nodeId1+nodeId2<<16, &dummy)) {
-	ConfigInfo::CI_ConfigRuleSection s;
+	ConfigInfo::ConfigRuleSection s;
 	s.m_sectionType= BaseString("TCP");
 	s.m_sectionData= new Properties(true);
 	char buf[16];
@@ -3418,7 +3418,7 @@ add_node_connections(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
     if(!p_connections.get("", nodeId1, &dummy)) {
       for (Uint32 j= 0;; j++){
 	if(!p_db_nodes.get("", j, &nodeId2)) break;
-	ConfigInfo::CI_ConfigRuleSection s;
+	ConfigInfo::ConfigRuleSection s;
 	s.m_sectionType= BaseString("TCP");
 	s.m_sectionData= new Properties(true);
 	char buf[16];
@@ -3435,7 +3435,7 @@ add_node_connections(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
 }
 
 
-static bool add_server_ports(Vector<ConfigInfo::CI_ConfigRuleSection>&sections, 
+static bool add_server_ports(Vector<ConfigInfo::ConfigRuleSection>&sections, 
 		      struct InitConfigFileParser::Context &ctx, 
 		      const char * rule_data)
 {
@@ -3475,7 +3475,7 @@ static bool add_server_ports(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
 }
 
 static bool
-check_node_vs_replicas(Vector<ConfigInfo::CI_ConfigRuleSection>&sections, 
+check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>&sections, 
 		       struct InitConfigFileParser::Context &ctx, 
 		       const char * rule_data)
 {
@@ -3602,4 +3602,4 @@ check_node_vs_replicas(Vector<ConfigInfo::CI_ConfigRuleSection>&sections,
   return true;
 }
 
-template class Vector<ConfigInfo::CI_ConfigRuleSection>;
+template class Vector<ConfigInfo::ConfigRuleSection>;
diff --git a/ndb/src/mgmsrv/InitConfigFileParser.cpp b/ndb/src/mgmsrv/InitConfigFileParser.cpp
index fdfe7823fc2..bf74f220b58 100644
--- a/ndb/src/mgmsrv/InitConfigFileParser.cpp
+++ b/ndb/src/mgmsrv/InitConfigFileParser.cpp
@@ -260,10 +260,10 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line) {
     return false;
   }
   ConfigInfo::Status status = m_info->getStatus(ctx.m_currentInfo, fname);
-  if (status == ConfigInfo::NOTIMPLEMENTED) {
+  if (status == ConfigInfo::CI_NOTIMPLEMENTED) {
     ctx.reportWarning("[%s] %s not yet implemented", ctx.fname, fname);
   }
-  if (status == ConfigInfo::DEPRICATED) {
+  if (status == ConfigInfo::CI_DEPRICATED) {
     const char * desc = m_info->getDescription(ctx.m_currentInfo, fname);
     if(desc){
       ctx.reportWarning("[%s] %s is depricated, use %s instead", 
@@ -316,7 +316,7 @@ InitConfigFileParser::storeNameValuePair(Context& ctx,
 
   const ConfigInfo::Type type = m_info->getType(ctx.m_currentInfo, fname);
   switch(type){
-  case ConfigInfo::BOOL: {
+  case ConfigInfo::CI_BOOL: {
     bool value_bool;
     if (!convertStringToBool(value, value_bool)) {
       ctx.reportError("Illegal boolean value for parameter %s", fname);
@@ -325,8 +325,8 @@ InitConfigFileParser::storeNameValuePair(Context& ctx,
     MGM_REQUIRE(ctx.m_currentSection->put(pname, value_bool));
     break;
   }
-  case ConfigInfo::INT:
-  case ConfigInfo::INT64:{
+  case ConfigInfo::CI_INT:
+  case ConfigInfo::CI_INT64:{
     Uint64 value_int;
     if (!convertStringToUint64(value, value_int)) {
       ctx.reportError("Illegal integer value for parameter %s", fname);
@@ -339,17 +339,17 @@ InitConfigFileParser::storeNameValuePair(Context& ctx,
 		      m_info->getMax(ctx.m_currentInfo, fname));
       return false;
     }
-    if(type == ConfigInfo::INT){
+    if(type == ConfigInfo::CI_INT){
       MGM_REQUIRE(ctx.m_currentSection->put(pname, (Uint32)value_int));
     } else {
       MGM_REQUIRE(ctx.m_currentSection->put64(pname, value_int));
     }
     break;
   }
-  case ConfigInfo::STRING:
+  case ConfigInfo::CI_STRING:
     MGM_REQUIRE(ctx.m_currentSection->put(pname, value));
     break;
-  case ConfigInfo::SECTION:
+  case ConfigInfo::CI_SECTION:
     abort();
   }
   return true;