From: Mayank Prasad
Date: May 20 2011 9:27am
Subject: bzr push into mysql-5.5 branch (mayank.prasad:3149 to 3150)
List-Archive: http://lists.mysql.com/commits/137769
Message-Id: <201105200927.p4K9RdRF024375@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3150 Mayank Prasad	2011-05-20 [merge]
      resolved pending merge conflicts from 5.1

 3149 Luis Soares	2011-05-19 [merge]
      BUG#11746302
      
      Manual merged mysql-5.1-gca into latest mysql-5.5.
      
      Conflicts
      =========
      Text conflict in mysql-test/suite/rpl/r/rpl_relayspace.result
      Text conflict in mysql-test/suite/rpl/t/rpl_relayspace.test

    modified:
      mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/t/rpl_relayspace.test
No bundle (reason: useless for push emails).