From: Marc Alff
Date: April 9 2011 10:36pm
Subject: bzr push into mysql-5.6-labs-performance-schema branch (marc.alff:3343 to
 3344)
List-Archive: http://lists.mysql.com/commits/135149
Message-Id: <201104092236.p39Manvp010846@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3344 Marc Alff	2011-04-10 [merge]
      Merge from mysql-5.6-labs-performance-schema

    modified:
      VERSION
 3343 Marc Alff	2011-04-08 [merge]
      Merge mysql-5.6-labs-performance-schema --> mysql-next-mr-marc

    modified:
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
=== modified file 'VERSION'
--- a/VERSION	2011-03-21 13:36:30 +0000
+++ b/VERSION	2011-04-09 22:32:53 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
 MYSQL_VERSION_PATCH=3
-MYSQL_VERSION_EXTRA=-m5
+MYSQL_VERSION_EXTRA=-labs-performance-schema

No bundle (reason: useless for push emails).