From: Bjorn Munch
Date: November 21 2011 11:33am
Subject: bzr push into mysql-5.5 branch (bjorn.munch:3621 to 3622)
List-Archive: http://lists.mysql.com/commits/142092
Message-Id: <201111211133.pALBX94C016727@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3622 Bjorn Munch	2011-11-21
      Followup to 11750417:
        Disable federated_plugin test for embedded, like other federated tests
        Also removed redundant include/not_embedded.inc from federated.test

    modified:
      mysql-test/suite/federated/federated.test
      mysql-test/suite/federated/federated_plugin.test
 3621 Sneha Modi	2011-11-21
      Bug#11748572:ALLOCATING A LARGE QUERY CACHE IS NOT DETERMINISTIC
      
      Setting query_cache_size to larger values might fail depending on the memory 
      pressure being put on the system. This can be seen on pushbuild as the test 
      case query_cache_size_basic tries to allocate a +3GB query cache, which 
      succeeds in some machines and fails in others.
      
      So this part of the code where the test case tries to allocate +3GB query cache has been 
      disabled for now to get the test running on pb2.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc
      mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result
      mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result
      mysql-test/suite/sys_vars/t/disabled.def
=== 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).