bzr push into mysql-5.5-cluster branch (magnus.blaudd:3395 to 3396)

[magnus.blaudd]

 3396 magnus.blaudd@stripped	2011-06-30 [merge]
      Merge

    modified:
      storage/ndb/compile-cluster
 3395 jonas oreland	2011-06-30
      ndb - add opt-file for ndb_autodiscover3 and ndb_discover_db which requires log-bin and binlog-format=row

    added:
      mysql-test/suite/ndb/t/ndb_discover_db-master.opt
      mysql-test/suite/ndb_team/t/ndb_autodiscover3-master.opt
    modified:
      mysql-test/suite/ndb_team/my.cnf
=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2011-06-30 07:11:24 +0000
+++ b/storage/ndb/compile-cluster	2011-06-30 08:57:42 +0000
@@ -76,9 +76,6 @@ my $cmake_version_id;
 
   # MySQL Server options
   push(@args, "--with-ssl");
-  push(@args, "--with-embedded-server");
-  push(@args, "--with-extra-charsets=complex");
-  push(@args, "--enable-mysql-maintainer-mode");
  
   if ($opt_debug)
   {

No bundle (reason: useless for push emails).