bzr push into mysql-5.5-cluster branch (jonas.oreland:3408 to 3410)

[jonas oreland]

 3410 jonas oreland	2011-07-01 [merge]
      ndb - merge 70-spj to 55

    modified:
      sql/abstract_query_plan.cc
 3409 jonas oreland	2011-07-01 [merge]
      ndb - merge 71 to 55

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
 3408 magnus.blaudd@stripped	2011-07-01
      ndb
       - Only call replace on CXXFLAGS and CFLAGS if they are set

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'sql/abstract_query_plan.cc'
--- a/sql/abstract_query_plan.cc	2011-06-23 06:59:40 +0000
+++ b/sql/abstract_query_plan.cc	2011-07-01 06:38:52 +0000
@@ -20,11 +20,8 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include "rpl_filter.h"
-#include <myisampack.h>
-#include <errno.h>
+#include "sql_priv.h"
 #include "sql_select.h"
-
 #include "abstract_query_plan.h"
 
 

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp	2011-05-24 17:54:07 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp	2011-07-01 06:08:38 +0000
@@ -23,18 +23,6 @@
 // debug note: uses new-style debug macro "D" unlike rest of DBTUX
 // there is no filtering feature (yet) like "DebugStat"
 
-#ifdef VM_TRACE
-inline NdbOut&
-NdbOut::operator<<(double x)
-{
-  NdbOut& out = *this;
-  char buf[100];
-  snprintf(buf, sizeof(buf), "%.02f", x);
-  out << buf;
-  return out;
-}
-#endif
-
 void
 Dbtux::execREAD_PSEUDO_REQ(Signal* signal)
 {

No bundle (reason: useless for push emails).