bzr push into mysql-5.5 branch (magnus.blaudd:3245 to 3247) Bug#13412605

[magnus.blaudd]

 3247 magnus.blaudd@stripped	2011-11-21
      Bug#13412605 FEDERATED_PLUGIN FAILS WITH --EMBEDDED
       - Skip test if running in --embedded mode

    modified:
      mysql-test/suite/federated/federated_plugin.test
 3246 magnus.blaudd@stripped	2011-11-21
      Remove hardcoding for federated

    modified:
      storage/ndb/compile-cluster
 3245 magnus.blaudd@stripped	2011-11-21
      Hardcode compile-cluster to always build mysqld with federated compiled in

    modified:
      storage/ndb/compile-cluster
=== 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 09:01:18 +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

=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2011-11-21 07:59:53 +0000
+++ b/storage/ndb/compile-cluster	2011-11-21 08:10:36 +0000
@@ -86,7 +86,6 @@ my $cmake_version_id;
   
   # Hardcoded options controlling how to build MySQL Server
   push(@args, "-DWITH_SSL=bundled");
-  push(@args, "-DWITH_FEDERATED=1");
  
   if ($opt_debug)
   {

No bundle (reason: useless for push emails).