bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:5040 to 5042)

[magnus.blaudd]

 5042 magnus.blaudd@stripped	2012-11-20 [merge]
      Merge 6.3 -> 7.0

    modified:
      storage/ndb/compile-cluster
 5041 magnus.blaudd@stripped	2012-11-20
      ndb
       - fix compiler warning about trigraph in string by removing one question mark

    modified:
      storage/ndb/src/ndbapi/ndberror.c
 5040 Mauritz Sundell	2012-11-15
      ndb - Restore config after TestNdbApiConfig

    modified:
      storage/ndb/test/ndbapi/testMgm.cpp
=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2012-11-13 14:17:07 +0000
+++ b/storage/ndb/compile-cluster	2012-11-20 17:24:42 +0000
@@ -195,8 +195,27 @@ if ($is_windows)
   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");
   }
 
@@ -207,9 +226,6 @@ if ($is_windows)
   }
   else
   {
-    # MySQL Server options
-    push(@args, "--with-ssl");
-
     # NDB options
     push(@args, "--with-plugin-ndbcluster");
     push(@args, "--with-ndb-test");
@@ -219,6 +235,8 @@ if ($is_windows)
   {
     print("compile-cluster: autotest build requested, extra everything\n");
     push(@args, "--with-ndb-ccflags='-DERROR_INSERT'");
+    push(@args, "--with-embedded-server");
+    push(@args, "--with-plugins=max");
   }
 
   cmd("sh", @args, @ARGV);

=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2012-11-06 10:22:18 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2012-11-20 17:23:00 +0000
@@ -594,7 +594,7 @@ ErrorBundle ErrorCodes[] = {
   { 1426, DMEC, SE, "No such subscriber" },
   { 1427, DMEC, NR, "Api node died, when SUB_START_REQ reached node "},
   { 1428, DMEC, IE, "No replica to scan on this node (internal index stats error)" },
-  { 1429, DMEC, IE, "Subscriber node undefined in SubStartReq (config change??)" },
+  { 1429, DMEC, IE, "Subscriber node undefined in SubStartReq (config change?)" },
 
   { 4004, DMEC, AE, "Attribute name or id not found in the table" },
   

No bundle (reason: useless for push emails).