From: Bjorn Munch
Date: November 21 2011 11:32am
Subject: bzr push into mysql-trunk branch (bjorn.munch:3623 to 3624)
List-Archive: http://lists.mysql.com/commits/142091
Message-Id: <201111211132.pALBWdSI032335@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3624 Bjorn Munch	2011-11-21 [merge]
      upmerge: don't run federated_plugin.test for embedded

    modified:
      mysql-test/suite/federated/federated.test
      mysql-test/suite/federated/federated_plugin.test
 3623 Evgeny Potemkin	2011-11-21 [merge]
      Auto-merged.

    removed:
      mysql-test/suite/rpl/r/rpl_parallel_benchmark.result
    modified:
      mysql-test/suite/large_tests/r/rpl_slave_net_timeout.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-innodb.result
      mysql-test/suite/parts/r/rpl-partition-dml-1-1-myisam.result
      mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
      mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
      mysql-test/suite/rpl/r/rpl_binlog_grant.result
=== modified file 'mysql-test/suite/federated/federated.test'
--- a/mysql-test/suite/federated/federated.test	2010-03-05 10:51:37 +0000
+++ b/mysql-test/suite/federated/federated.test	2011-11-21 11:28:35 +0000
@@ -4,8 +4,6 @@
 #
 
 
-# should work with embedded server after mysqltest is fixed
---source include/not_embedded.inc
 --source federated.inc
 
 connection default;

=== modified file 'mysql-test/suite/federated/federated_plugin.test'
--- a/mysql-test/suite/federated/federated_plugin.test	2011-09-15 11:09:24 +0000
+++ b/mysql-test/suite/federated/federated_plugin.test	2011-11-21 11:28:35 +0000
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
 --source include/have_federated_plugin.inc
 
 # Uninstall will not uninstall if ps has been used

No bundle (reason: useless for push emails).