From: Tor Didriksen
Date: February 17 2011 7:36am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3661 to 3662)
List-Archive: http://lists.mysql.com/commits/131498
Message-Id: <20110217073644.8D28237B1@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3662 Tor Didriksen	2011-02-17 [merge]
      merge 5.5 => trunk

    modified:
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
 3661 Jonathan Perkin	2011-02-16 [merge]
      Merge to mysql-trunk

    modified:
      README
=== modified file 'mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test'
--- a/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test	2011-02-17 07:36:05 +0000
@@ -13,6 +13,7 @@
 --source include/have_debug.inc
 --source include/master-slave.inc
 --source include/not_embedded.inc
+--source include/not_var_link.inc
 
 ##########################################################################
 #                            Loading data

No bundle (reason: useless for push emails).