bzr push into mysql-5.5-cluster branch (magnus.blaudd:3401 to 3402)

[magnus.blaudd]

 3402 magnus.blaudd@stripped	2011-06-30
      ndb
       - disable maintainer mode when using --with-debug

    modified:
      storage/ndb/compile-cluster
 3401 magnus.blaudd@stripped	2011-06-30 [merge]
      Merge 7.1 -> 5.5-cluster(null merge again)

=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2011-06-30 08:57:42 +0000
+++ b/storage/ndb/compile-cluster	2011-06-30 14:08:28 +0000
@@ -36,6 +36,7 @@ GetOptions(
 
   # Build MySQL Server and NDB with debug
   'debug' => \$opt_debug,
+  'with-debug=s' => \$opt_debug,
 
 
 ) or exit(1);
@@ -80,6 +81,7 @@ my $cmake_version_id;
   if ($opt_debug)
   {
     push(@args, "--with-debug");
+    push(@args, "--disable-mysql-maintainer-mode");
   }
 
   # NDB options

No bundle (reason: useless for push emails).