bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4453 to 4454)

[jonas oreland]

 4454 jonas oreland	2011-08-16
      ndb - fix build problem...

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
 4453 jonas oreland	2011-08-16
      ndb - wl#4163 j01_fix.diff - bug#12873640
        Fix invalid write for Tux-nodes wo/ prefix (if max-len does not fit 16-bytes)
        Implement randomized start_page_id (which traps this bug directly)

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp	2011-08-16 08:27:14 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp	2011-08-16 08:47:35 +0000
@@ -173,8 +173,8 @@ Dbtux::setNodePref(TuxCtx & ctx, NodeHan
       debugOut << " " << prefKey.print(ctx.c_debugBuffer, DebugBufferBytes);
       debugOut << endl;
     }
-  }
 #endif
+  }
 }
 
 // node operations

No bundle (reason: useless for push emails).