List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:October 27 2010 10:20am
Subject:bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3326 to
3327)
View as plain text  
 3327 Jonas Oreland	2010-10-27
      ndb spj svs - fix reception of SCAN_HBREP

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp
 3326 Jan Wedvik	2010-10-26
      This commit fixes two errors related to pushed queries involving varchar types:
      
      1. Some queries would fail with the error message: 'Character Parameter was
      right truncated'. This was due to an attempt to convert string from a format
      with 2-byte length field to 1-byte length field when the string already had
      a one-byte length field.
      
      2. Varchar values that were parameters to non-root pushed operations would
      not get the one- or two-byte length fields they should have. The SPJ block would
      then either crash (on an ndbrequire) or misinterpret the string.

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/t/ndb_join_pushdown.test
      sql/ha_ndbcluster.cc
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp	2010-05-20 11:18:08 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjInit.cpp	2010-10-27 10:20:34 +0000
@@ -62,6 +62,7 @@ Dbspj::Dbspj(Block_context& ctx, Uint32 
   addRecSignal(GSN_SCAN_FRAGREF, &Dbspj::execSCAN_FRAGREF);
   addRecSignal(GSN_SCAN_FRAGCONF, &Dbspj::execSCAN_FRAGCONF);
   addRecSignal(GSN_TRANSID_AI, &Dbspj::execTRANSID_AI);
+  addRecSignal(GSN_SCAN_HBREP, &Dbspj::execSCAN_HBREP);
 
   ndbout << "Instantiating DBSPJ instanceNo=" << instanceNumber << endl;
 }//Dbspj::Dbspj()


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20101027102034-ev4k9x6fids2ucee.bundle
Thread
bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3326 to3327) Jonas Oreland27 Oct