bzr push into mysql-5.1-telco-7.0 branch (jonas:3397 to 3398)

[Jonas Oreland]

 3398 Jonas Oreland	2010-02-04
      ndb - bah remove c++ code from NdbThread.c

    modified:
      storage/ndb/src/common/portlib/NdbThread.c
 3397 Jonas Oreland	2010-02-04 [merge]
      merge 70-main

    modified:
      mysql-test/suite/ndb/t/ndb_mgm.test
      mysql-test/suite/ndb/t/test_mgmd.test
      mysql-test/suite/ndb/t/test_ndbinfo.test
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/src/mgmclient/ndb_mgmclient.hpp
=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c	2010-02-04 15:18:17 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c	2010-02-04 19:50:43 +0000
@@ -513,6 +513,10 @@ NdbThread_End()
 int
 NdbThread_SetHighPrioProperties(const char * spec)
 {
+  char * copy = 0;
+  char * prio = 0;
+  int found = 0;
+
   if (spec == 0)
   {
     f_high_prio_set = 0;
@@ -525,14 +529,14 @@ NdbThread_SetHighPrioProperties(const ch
   while ((* spec == ' ') || (*spec == '\t'))
     spec++;
 
-  char * copy = strdup(spec);
+  copy = strdup(spec);
   if (copy == 0)
     return -1;
 
   /**
    * is there a "," in spec
    */
-  char * prio = strchr(copy, ',');
+  prio = strchr(copy, ',');
   if (prio)
   {
     * prio = 0;
@@ -549,7 +553,7 @@ NdbThread_SetHighPrioProperties(const ch
   }
 
 #ifdef HAVE_PTHREAD_SETSCHEDPARAM
-  int found = 0;
+  found = 0;
 #ifdef SCHED_FIFO
   if (strcmp("fifo", copy) == 0)
   {


Attachment: [text/bzr-bundle] bzr/[e-mail]