From: Frazer Clement
Date: January 31 2012 1:21pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (frazer.clement:3800 to 3801)
List-Archive: http://lists.mysql.com/commits/142680
Message-Id: <201201311321.q0VDLST5008742@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3801 Frazer Clement	2012-01-31 [merge]
      Merge 7.1->7.2

 3800 Frazer Clement	2012-01-31 [merge]
      Merge 7.1->7.2

    added:
      sql/ndb_conflict.cc
      sql/ndb_conflict.h
    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_basic.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ndb_share.cc
      sql/ndb_share.h
      sql/ndb_thd.cc
      storage/ndb/CMakeLists.txt
No bundle (reason: useless for push emails).