bzr push into mysql-5.1-telco-7.0 branch (martin.zaun:3950 to 3951)

[Martin Zaun]

 3951 Martin Zaun	2010-11-05
      ndb - fix compile error: 'NDB_TRACE_NUMA' was not declared in this scope

    modified:
      storage/ndb/src/common/portlib/NdbNuma.cpp
 3950 Magnus Blåudd	2010-11-05
      ndb
       - mark up patch for BUG40081 aka. BUG58017 with ifndefs
       - remove hack which is no longer needed when the above bug is fixed.
       - testcase is in ndb_update.test

    modified:
      sql/ha_ndbcluster.cc
      sql/table.cc
=== 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/[e-mail]