bzr push into mysql-5.1-telco-7.0 branch (jonas:2890 to 2891) Bug#44827

[Jonas Oreland]

 2891 Jonas Oreland	2009-05-12
      ndb - bug#44827, fix bug in bugfix causing ndbmtd to crash

    M  storage/ndb/src/kernel/blocks/LocalProxy.cpp
 2890 Jonas Oreland	2009-05-12 [merge]
      merge 63 to 64

    M  storage/ndb/test/include/NdbRestarter.hpp
    M  storage/ndb/test/ndbapi/testUpgrade.cpp
    M  storage/ndb/test/run-test/command.cpp
    M  storage/ndb/test/run-test/upgrade-tests.txt
    M  storage/ndb/test/src/NdbRestarter.cpp
     2585.89.13 Jonas Oreland	2009-05-12 [merge]
                ndb merge 62 to 63
                  (testUpgrade)

        M  storage/ndb/test/include/NdbRestarter.hpp
        M  storage/ndb/test/ndbapi/testUpgrade.cpp
        M  storage/ndb/test/run-test/command.cpp
        M  storage/ndb/test/run-test/upgrade-tests.txt
        M  storage/ndb/test/src/NdbRestarter.cpp
     2572.56.17 Jonas Oreland	2009-05-12
                ndb - add new upgrade test
                  1) Upgrade_FS - checks if FS is compatible
                  2) Upgrade_Traffic - run traffic during upgrade
                  3) Upgrade_Traffic_FS- run traffic during upgrade wo/ initial

        M  storage/ndb/test/include/NdbRestarter.hpp
        M  storage/ndb/test/ndbapi/testUpgrade.cpp
        M  storage/ndb/test/run-test/command.cpp
        M  storage/ndb/test/run-test/upgrade-tests.txt
        M  storage/ndb/test/src/NdbRestarter.cpp
=== modified file 'storage/ndb/src/kernel/blocks/LocalProxy.cpp'
--- a/storage/ndb/src/kernel/blocks/LocalProxy.cpp	2009-05-12 15:01:40 +0000
+++ b/storage/ndb/src/kernel/blocks/LocalProxy.cpp	2009-05-12 18:40:56 +0000
@@ -825,7 +825,7 @@ LocalProxy::execCREATE_TRIG_IMPL_REQ(Sig
   const CreateTrigImplReq* req = (const CreateTrigImplReq*)signal->getDataPtr();
   Ss_CREATE_TRIG_IMPL_REQ& ss = ssSeize<Ss_CREATE_TRIG_IMPL_REQ>();
   ss.m_req = *req;
-  ndbrequire(signal->getLength() == CreateTrigImplReq::SignalLengthLocal);
+  ndbrequire(signal->getLength() <= CreateTrigImplReq::SignalLengthLocal);
   sendREQ(signal, ss);
 }
 


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