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

 4291 Tor Didriksen	2012-09-18 [merge]
      NULL merge 5.5 => 5.6

 4290 Nuno Carvalho	2012-09-18
      BUG#14640486: MISSING INITIALIZATION OF MYSQL_BIN_LOG::M_PREP_XIDS_COND
      
      MYSQL_BIN_LOG::m_prep_xids_cond is not initialized on MYSQL_BIN_LOG 
      object creation and not destroyed on MYSQL_BIN_LOG destructor.
      
      Added missing initialization and destruction, also created a new 
      perfschema key for this condition variable.
      
      @ mysql-test/suite/perfschema/r/relaylog.result
         Update result file with new key.
      @ sql/binlog.cc
         Added m_prep_xids_cond initialization and destruction.
      @ sql/binlog.h
         Added perfschema key and update MYSQL_BIN_LOG constructor.
      @ sql/mysqld.cc
         Added perfschema keys for BINLOG and RELAYLOG.
      @ sql/mysqld.h
         Added perfschema keys for BINLOG and RELAYLOG.
      @ sql/rpl_rli.cc
         Updated Rpl_info constructor.

    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).