List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:November 6 2010 12:43am
Subject:bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3958 to 3959)
View as plain text  
 3959 Martin Zaun	2010-11-05 [merge]
      ndb - merge from 7.0 to 7.1

    modified:
      storage/ndb/src/common/portlib/NdbNuma.cpp
 3958 Magnus Blåudd	2010-11-05
      ndb - include relevant util files

    modified:
      storage/ndb/config/type_JAVA.cmake
=== modified file 'storage/ndb/src/common/portlib/NdbNuma.cpp'
--- a/storage/ndb/src/common/portlib/NdbNuma.cpp	2010-11-01 11:45:26 +0000
+++ b/storage/ndb/src/common/portlib/NdbNuma.cpp	2010-11-06 00:24:16 +0000
@@ -18,11 +18,11 @@
 #include <NdbNuma.h>
 #include <ndb_global.h>
 
+static int NDB_TRACE_NUMA = 0;
+
 #if defined HAVE_DLFCN_H && defined HAVE_DLOPEN
 #include <dlfcn.h>
 
-static int NDB_TRACE_NUMA = 0;
-
 /**
  * Load libnuma using dlopen, not have to put link dependency on it...
  * - handle fact that there are 2 versions of libnuma...

Attachment: [text/bzr-bundle] bzr/martin.zaun@oracle.com-20101106004035-rf63mjaqpd9xa4mr.bundle
Thread
bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3958 to 3959) Martin Zaun6 Nov