bzr push into mysql-5.1-telco-6.3 branch (magnus.blaudd:3507 to 3508)

[magnus.blaudd]

 3508 magnus.blaudd@stripped	2012-11-20
      compile-cluster
       - hardcode a few more configure args necessary for 5.1 based

    modified:
      storage/ndb/compile-cluster
 3507 magnus.blaudd@stripped	2012-11-20
      ndb -backport ha_ndbcluster_connection.cc compiler warning fixes from 7.0

    modified:
      sql/ha_ndbcluster_connection.cc
=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2012-11-20 13:47:23 +0000
+++ b/storage/ndb/compile-cluster	2012-11-20 15:48:35 +0000
@@ -102,8 +102,27 @@ if ($opt_parse_log)
   push(@args, "$srcdir/configure");
   push(@args, "--enable-silent-rules");
 
+  # Standard MySQL Server 5.1 hardcoded options
+  push(@args, "--enable-assembler");
+  push(@args, "--with-extra-charsets=complex");
+  push(@args, "--enable-thread-safe-client");
+  push(@args, "--with-big-tables");
+  push(@args, "--enable-local-infile");
+  push(@args, "--with-ssl");
+
+  # Choose readline or libedit based
+  if (-d "$srcdir/cmd-line-utils/readline")
+  {
+    push(@args, "--with-readline");
+  }
+  elsif (-d "$srcdir/cmd-line-utils/libedit")
+  {
+    push(@args, "--with-libedit");
+  }
+
   if ($opt_debug)
   {
+    print("compile-cluster: debug build requested\n");
     push(@args, "--with-debug");
   }
 
@@ -114,9 +133,6 @@ if ($opt_parse_log)
   }
   else
   {
-    # MySQL Server options
-    push(@args, "--with-ssl");
-
     # NDB options
     push(@args, "--with-plugin-ndbcluster");
     push(@args, "--with-ndb-test");

No bundle (reason: useless for push emails).