From: Jonas Oreland
Date: February 4 2010 7:50pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (jonas:3398)
List-Archive: http://lists.mysql.com/commits/99340
Message-Id: <20100204195048.6B6729E7F09@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_lUnBBESQSWOWDezH9zmYZw)"

--Boundary_(ID_lUnBBESQSWOWDezH9zmYZw)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/jonas/src/telco-6.4/ based on revid:jonas@stripped

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

    modified:
      storage/ndb/src/common/portlib/NdbThread.c
=== 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)
   {


--Boundary_(ID_lUnBBESQSWOWDezH9zmYZw)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/jonas@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jonas@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-6.4/
# testament_sha1: 191d32f22aaef733ba3efbd33e4718cbcca222ec
# timestamp: 2010-02-04 20:50:48 +0100
# source_branch: file:///home/jonas/src/64-local/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWckednAAAaffgEAQUf///1IR
hAC////wUAPh7kC7e9hW73vXCUU2iFPTENBtKn6aU9PRTTek1MmanqaDQJKkaZGNIaaMg00AAAAA
CUInkk02qPUaBo0aaZAAANADJJNqGnqaHqekB6gANGgABoCSRAAEYamiYk0Yyh5R6gZDRVHVovgy
Se2WRaPlFWCKKkq36KHMiFFtxczJfIJTbm7GWs51KqodcQ9EPd8+qtdEHjLnWRdJK52c+Ii9v1jf
gY2Yumf22mt7UyMQjJM34d1UiKFs3Dv2U311svVbswkkbHIhbp3rrX33VeDFztTNoY7hDnhvLtqn
y4iYsmzY254eiRacdXd0RJOSIGZp53brUhgThEgyqHiHGJCiyLBR6BpZgFKCGp7YKRoxcsVsd/Ei
hQYYHzd0867DiSgvM6qlR4vxc6CYCFcD8qOWzzjg36yrYTARkm+YvIphh9uOD1rMXazgZWG0qeqp
pJZUxEE44FuNHJUmKebxxgv7paX0FBoQIH8jKX3WOve52ROKQ7WYkza2oYempGIqfDCMtzmmmv2U
bVXChbDA9xv8zvE5W9blKidR8R7oVTFt4yiJIy15aYlM+mzTAa0rMuCdMzVFQ4VxxFK95HupTDJ+
o1BG/qMu4p6ErC6sQF8PAlLOLx0NTIh2PP6PlcOrSZEGxqinqsy81GFErREYt03WEQTDaMpyH9HA
h8jQ88mxxZIRjt+FTwCcBaljleaDOMIyirOEoSziIJcppXDivYcTuI8KjJSEBj22BRr12FGUX+a7
DGSEnQeLOEMKnQFzAFQBBIpo0GrTMJSMFLkrh7GT70FNJeWo826fTPudJhQcTJz99fefA2fktAyF
QcpSw1SlmPed3OgrYwTInFRfH5RBuLrVFGeJOA5SCj11okyLioVZeaiIoO3DwJoOFw8eCUWXrA6R
15DQBlRgdh/tINtvE+kW3g12PIUh8RaGewIiFwVu56PfWYgXAcM0/V6w5MdRyby0OJOZh5/j7jJH
IsUE8CfcEW58bIdKQS+1Jjkar6SMwtctpw4J/EQmmNZkJyW8YF1oMiUPtt5ksUj/e+4GZDJzEDPP
cz0DQJkSf8SNSyFnEREZgo1oBE1gCnB73loMqxRmE+E0tVjBjBp1cYn0iUUdtTRDYWqFRE9OQdCv
+rXCbPZLBUljjbL0u4JzDQ44oqXNArIg1TLNShmAV6eeRWvSKIQnScNukkpw6Q+f28YEPUsX6WcC
kmoMDPvIxqEUphk5lDyOZETnv6LhSPotN8VSt3+gqQOPnd4g/yzE/kTpyLH83OcqjjDuRCAkmEUq
RTFEZ8n8XckU4UJDJHnZwA==


--Boundary_(ID_lUnBBESQSWOWDezH9zmYZw)--