bzr push into mysql-trunk-cluster branch (magnus.blaudd:3475 to 3476)

[magnus.blaudd]

 3476 magnus.blaudd@stripped	2012-04-13 [merge]
      Merge

    modified:
      storage/ndb/compile-cluster
 3475 Pekka Nousiainen	2012-04-12
      wl#946 x04_fix.diff
      try to fix ndb_select_all test on windows (2)

    modified:
      mysql-test/suite/ndb/r/ndb_wl946_main.result
      mysql-test/suite/ndb/t/ndb_wl946_select_all.inc
=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2012-03-15 08:23:12 +0000
+++ b/storage/ndb/compile-cluster	2012-04-13 06:55:58 +0000
@@ -85,7 +85,7 @@ my $cmake_version_id;
   my @args;
   
   # Hardcoded options controlling how to build MySQL Server
-  # push(@args, "-DWITH_SSL=bundled");
+  push(@args, "-DWITH_SSL=bundled");
  
   if ($opt_debug)
   {

No bundle (reason: useless for push emails).