From: Tor Didriksen
Date: September 18 2012 3:36pm
Subject: bzr push into mysql-trunk branch (tor.didriksen:4506 to 4507)
List-Archive: http://lists.mysql.com/commits/144779
Message-Id: <20120918153635.8267.98318.4507@atum07.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4507 Tor Didriksen	2012-09-18 [merge]
      NULL merge 5.6 => trunk

 4506 Nuno Carvalho	2012-09-18 [merge]
      BUG#14640486: MISSING INITIALIZATION OF MYSQL_BIN_LOG::M_PREP_XIDS_COND
      
      Merge from mysql-5.6 into mysql-trunk.

    modified:
      mysql-test/suite/perfschema/r/relaylog.result
      sql/binlog.cc
      sql/binlog.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/rpl_rli.cc
No bundle (reason: useless for push emails).