bzr push into mysql-5.1-telco-7.0 branch (jonas:4385 to 4386)

[Jonas Oreland]

 4386 Jonas Oreland	2011-05-17
      ndb - fix compiler warning in NdbMutex.c

    modified:
      storage/ndb/src/common/portlib/NdbMutex.c
 4385 Jonas Oreland	2011-05-17
      ndb - fix upgrade wrt extension on tcseizeconf (for mt tc)

    modified:
      storage/ndb/src/ndbapi/Ndb.cpp
=== modified file 'storage/ndb/src/common/portlib/NdbMutex.c'
--- a/storage/ndb/src/common/portlib/NdbMutex.c	2011-02-03 14:20:36 +0000
+++ b/storage/ndb/src/common/portlib/NdbMutex.c	2011-05-17 07:57:55 +0000
@@ -88,12 +88,14 @@ int NdbMutex_InitWithName(NdbMutex* pNdb
   defined(HAVE_PTHREAD_MUTEXATTR_INIT) && \
   defined(HAVE_PTHREAD_MUTEXATTR_SETTYPE)
 
-  pthread_mutexattr_t t;
-  pthread_mutexattr_init(&t);
-  pthread_mutexattr_settype(&t, PTHREAD_MUTEX_ERRORCHECK);
-  result = pthread_mutex_init(p, &t);
-  assert(result == 0);
-  pthread_mutexattr_destroy(&t);
+  {
+    pthread_mutexattr_t t;
+    pthread_mutexattr_init(&t);
+    pthread_mutexattr_settype(&t, PTHREAD_MUTEX_ERRORCHECK);
+    result = pthread_mutex_init(p, &t);
+    assert(result == 0);
+    pthread_mutexattr_destroy(&t);
+  }
 #else
   result = pthread_mutex_init(p, 0);
 #endif

No bundle (reason: useless for push emails).