bzr push into mysql-5.1-telco-7.0-wl4124 branch (pekka:4381 to 4382) WL#4124

[Pekka Nousiainen]

 4382 Pekka Nousiainen	2011-05-25
      wl#4124 x04_fix.diff
      cmake build fixes

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
 4381 Pekka Nousiainen	2011-05-24
      wl#4124 x03_fix.diff
      windows build fixes

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp	2011-05-19 09:40:36 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp	2011-05-25 06:42:30 +0000
@@ -15,6 +15,7 @@
 
 #include "DbtuxProxy.hpp"
 #include "Dbtux.hpp"
+#include "../dblqh/DblqhCommon.hpp"
 
 DbtuxProxy::DbtuxProxy(Block_context& ctx) :
   LocalProxy(DBTUX, ctx)

=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp	2011-05-19 09:40:36 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp	2011-05-25 06:42:30 +0000
@@ -20,7 +20,6 @@
 #include <signaldata/AlterIndxImpl.hpp>
 #include <signaldata/DropTab.hpp>
 #include <signaldata/IndexStatSignal.hpp>
-#include <DblqhCommon.hpp>
 
 class DbtuxProxy : public LocalProxy {
 public:

No bundle (reason: useless for push emails).