bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4489 to 4490)

[jonas oreland]

 4490 jonas oreland	2011-08-30
      ndb - fix windows problems in mt_thr_config

    modified:
      storage/ndb/src/kernel/vm/mt_thr_config.cpp
 4489 jonas oreland	2011-08-30
      ndb - change to use THRConfig for thread-config (not yet cpu-bindings)

    modified:
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/Configuration.hpp
      storage/ndb/src/kernel/vm/Makefile.am
      storage/ndb/src/kernel/vm/mt_thr_config.cpp
      storage/ndb/src/kernel/vm/mt_thr_config.hpp
=== modified file 'storage/ndb/src/kernel/vm/mt_thr_config.cpp'
--- a/storage/ndb/src/kernel/vm/mt_thr_config.cpp	2011-08-30 12:00:48 +0000
+++ b/storage/ndb/src/kernel/vm/mt_thr_config.cpp	2011-08-30 14:13:15 +0000
@@ -544,7 +544,7 @@ static
 char *
 skipblank(char * str)
 {
-  while (isblank(* str))
+  while (isspace(* str))
     str++;
   return str;
 }
@@ -592,7 +592,7 @@ parseUnsigned(char *& str, unsigned * ds
   str = skipblank(str);
   char * endptr = 0;
   errno = 0;
-  long val = strtoll(str, &endptr, 0);
+  long val = strtol(str, &endptr, 0);
   if (errno == ERANGE)
     return -1;
   if (val < 0 || Int64(val) > 0xFFFFFFFF)
@@ -613,7 +613,7 @@ parseBitmask(char *& str, SparseBitmask
   if (len == 0)
     return -1;
 
-  while (isblank(str[len-1]))
+  while (isspace(str[len-1]))
     len--;
   if (str[len-1] == ',')
     len--;
@@ -858,7 +858,7 @@ THRConfig::do_parse(const char * ThreadC
 unsigned
 THRConfig::createCpuSet(const SparseBitmask& mask)
 {
-  for (size_t i = 0; i < m_cpu_sets.size(); i++)
+  for (unsigned i = 0; i < m_cpu_sets.size(); i++)
     if (m_cpu_sets[i].equal(mask))
       return i;
 

No bundle (reason: useless for push emails).