From: Tatjana Azundris Nuernberg
Date: October 27 2012 12:40pm
Subject: bzr push into mysql-trunk branch (tatjana.nuernberg:4830 to 4831)
List-Archive: http://lists.mysql.com/commits/145121
Message-Id: <20121027124031.5759.28634.4831@envy>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4831 Tatjana Azundris Nuernberg	2012-10-27 [merge]
      NULL merge of backport

 4830 Jon Olav Hauglid	2012-10-27
      Fix test failures in
       rpl.rpl_loaddata
       rpl.rpl_stm_loaddata_concurrent
      due to error message renumbering

    modified:
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/suite/rpl/r/rpl_loaddata.result
      mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
No bundle (reason: useless for push emails).