From: Bjorn Munch
Date: July 19 2012 2:02pm
Subject: bzr push into mysql-trunk branch (bjorn.munch:4090 to 4091)
List-Archive: http://lists.mysql.com/commits/144465
Message-Id: <20120719140257.20.30944.4091@khepri15.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4091 Bjorn Munch	2012-07-19 [merge]
      null upmerge

 4090 Marc Alff	2012-07-19 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_digest.cc
      storage/perfschema/pfs_digest.h
No bundle (reason: useless for push emails).