bzr push into mysql-5.1 tree (frazer:2857 to 2857)

[Frazer Clement]

------------------------------------------------------------
revno: 2857
revision-id: frazer@stripped
parent: jack@asus-20080922135703-3rl1wg03f5ikbkbl
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4
timestamp: Wed 2008-09-24 16:01:01 +0100
message:
  Merge 6.3->6.4
modified:
  mysql-test/suite/ndb/r/ndb_bulk_delete.result sp1f-ndb_bulk_delete.resu-20071026182126-qxg7ganxqoscfo5te4ljrbiy2sboy5fl
  mysql-test/suite/ndb/r/ndb_update_no_read.result sp1f-ndb_update_no_read.r-20071026094230-qtojepnwggmwspijgzrzxl6mqla5ekyb
  mysql-test/suite/ndb/t/ndb_bulk_delete.test sp1f-ndb_bulk_delete.test-20071026182126-6byflwi57skdppctwaqthshdpefzs7gr
  mysql-test/suite/ndb/t/ndb_update_no_read.test sp1f-ndb_update_no_read.t-20071026094230-wfyaomorxnqaykcrsk62r74itwvcje32
  sql/ha_ndbcluster.cc           sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
  sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
  sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
    ------------------------------------------------------------
    revno: 2585.17.8
    revision-id: frazer@stripped
    parent: jonas@stripped
    committer: Frazer Clement <frazer@stripped>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Wed 2008-09-24 15:44:11 +0100
    message:
      Bug #37153 Ndb Cluster reports affected rows incorrectly
      
      Cluster can report affected rows incorrectly when Insert or Delete used 
      with AutoCommit.
      
      This patch corrects the affected rows counts.
    modified:
      mysql-test/suite/ndb/r/ndb_bulk_delete.result sp1f-ndb_bulk_delete.resu-20071026182126-qxg7ganxqoscfo5te4ljrbiy2sboy5fl
      mysql-test/suite/ndb/r/ndb_update_no_read.result sp1f-ndb_update_no_read.r-20071026094230-qtojepnwggmwspijgzrzxl6mqla5ekyb
      mysql-test/suite/ndb/t/ndb_bulk_delete.test sp1f-ndb_bulk_delete.test-20071026182126-6byflwi57skdppctwaqthshdpefzs7gr
      mysql-test/suite/ndb/t/ndb_update_no_read.test sp1f-ndb_update_no_read.t-20071026094230-wfyaomorxnqaykcrsk62r74itwvcje32
      sql/ha_ndbcluster.cc           sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
      sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
      sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s

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