bzr commit into mysql-5.1 tree (frazer:2860) Bug#39536

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-6.4/

------------------------------------------------------------
revno: 2860
revision-id: frazer@stripped
parent: frazer@stripped
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4
timestamp: Mon 2008-09-29 19:31:39 +0100
message:
  Merge 6.3->6.4
modified:
  mysql-test/suite/ndb/r/ndb_insert.result
sp1f-ndb_insert.result-20040430070606-wddzvp2f7jigm33duermsonkpk2un663
  sql/ha_ndbcluster.cc          
sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
  storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
sp1f-ndbinterpretedcode.c-20070529114654-w2exwio2w4x73e22p5wcfsa3bgqrtous
    ------------------------------------------------------------
    revno: 2585.15.6
    revision-id: frazer@stripped
    parent: tomas.ulin@stripped
    parent: frazer@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Mon 2008-09-29 19:28:00 +0100
    message:
      Merge 6.3->6.4
    modified:
      storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
sp1f-ndbinterpretedcode.c-20070529114654-w2exwio2w4x73e22p5wcfsa3bgqrtous
        ------------------------------------------------------------
        revno: 2572.29.8
        revision-id: frazer@stripped
        parent: jonas@stripped
        committer: Frazer Clement <frazer@stripped>
        branch nick: mysql-5.1-telco-6.2
        timestamp: Mon 2008-09-29 19:26:36 +0100
        message:
          Bug#39536 : NdbInterpretedCode add_val() does not work for values > 65535
          
          Fix branch scope bug
        modified:
          storage/ndb/src/ndbapi/NdbInterpretedCode.cpp
sp1f-ndbinterpretedcode.c-20070529114654-w2exwio2w4x73e22p5wcfsa3bgqrtous
    ------------------------------------------------------------
    revno: 2585.15.5
    revision-id: tomas.ulin@stripped
    parent: frazer@stripped
    committer: Tomas Ulin <tomas.ulin@stripped>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Mon 2008-09-29 18:21:47 +0200
    message:
      Bug #39538 Constraint violation in multi-row insert does not abort transaction
    modified:
      mysql-test/suite/ndb/r/ndb_insert.result
sp1f-ndb_insert.result-20040430070606-wddzvp2f7jigm33duermsonkpk2un663
      sql/ha_ndbcluster.cc          
sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2

Attachment: [text/text/x-diff] patch-2860.diff