bzr push into mysql-5.1-telco-7.0-spj branch (jonas:2881 to 2882)

[Jonas Oreland]

 2882 Jonas Oreland	2009-05-05
      ndb - spj - fix bug in ArenaPool

    M  storage/ndb/src/kernel/vm/ArenaPool.cpp
    M  storage/ndb/src/kernel/vm/ArenaPool.hpp
 2881 Jonas Oreland	2009-05-04
      ndb spj - add support for setting ANY_VALUE directly in LQHKEYREQ/SCAN_FRAGREQ to be used as correlation factor

    M  storage/ndb/include/kernel/AttributeHeader.hpp
    M  storage/ndb/include/kernel/signaldata/LqhKey.hpp
    M  storage/ndb/include/kernel/signaldata/ScanFrag.hpp
    M  storage/ndb/include/kernel/signaldata/TupKey.hpp
    M  storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
    M  storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
    M  storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    M  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    M  storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
    M  storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
    M  storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
    M  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
    M  storage/ndb/test/tools/test_spj.cpp
=== modified file 'storage/ndb/src/kernel/vm/ArenaPool.cpp'
--- a/storage/ndb/src/kernel/vm/ArenaPool.cpp	2009-05-04 07:12:52 +0000
+++ b/storage/ndb/src/kernel/vm/ArenaPool.cpp	2009-05-05 13:15:52 +0000
@@ -50,7 +50,7 @@ ArenaAllocator::init(Uint32 sz, Uint32 t
 
   Uint32 bs = computeBlockSize(blocksz, wpp);
   Record_info ri;
-  ri.m_size = bs;
+  ri.m_size = 4 * bs;
   {
     ArenaBlock tmp;
     const char * off_base = (char*)&tmp;

=== modified file 'storage/ndb/src/kernel/vm/ArenaPool.hpp'
--- a/storage/ndb/src/kernel/vm/ArenaPool.hpp	2009-05-04 07:12:52 +0000
+++ b/storage/ndb/src/kernel/vm/ArenaPool.hpp	2009-05-05 13:15:52 +0000
@@ -22,12 +22,13 @@
 struct ArenaBlock
 {
   Uint32 m_magic;
-  Uint32 m_next_block;
   union {
+    Uint32 m_next_block;
     Uint32 nextPool;
-    Uint32 m_data[1];
   };
 
+  Uint32 m_data[1];
+
   STATIC_CONST( HeaderSize = 2 );
 
   static Uint32 computeBlockSizeInWords(Uint32 datasz) {


Attachment: [text/bzr-bundle] bzr/[e-mail]