bzr push into mysql-5.5-cluster branch (jonas.oreland:3402 to 3404) Bug#61709

[jonas oreland]

 3404 jonas oreland	2011-06-30
      ndb - bug#61709 - c++ comments in c-files

    modified:
      extra/perror.c
      plugin/auth/qa_auth_interface.c
      tests/mysql_client_test.c
 3403 jonas oreland	2011-06-30
      ndb - bug#61708

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

    modified:
      storage/ndb/compile-cluster
=== modified file 'configure.cmake'
--- a/configure.cmake	2011-02-02 18:13:28 +0000
+++ b/configure.cmake	2011-06-30 15:06:25 +0000
@@ -784,7 +784,12 @@ IF(NOT C_HAS_inline)
   static __inline int foo(){return 0;}
   int main(int argc, char *argv[]){return 0;}"
                             C_HAS___inline)
-  SET(C_INLINE __inline)
+  # MCP_BUG61708
+  IF (C_HAS___inline)
+    SET(C_INLINE __inline)
+  ELSE()
+    SET(C_INLINE)
+  ENDIF()
 ENDIF()
 
 IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)

=== modified file 'extra/perror.c'
--- a/extra/perror.c	2011-05-12 08:43:50 +0000
+++ b/extra/perror.c	2011-06-30 15:24:13 +0000
@@ -32,7 +32,11 @@ static my_bool verbose, print_all_codes;
 
 #include "../include/my_base.h"
 #include "../mysys/my_handler_errors.h"
+#ifndef MCP_BUG61709
+/* #include "../include/my_compare.h" */
+#else
 // #include "../include/my_compare.h"
+#endif
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 static my_bool ndb_code;

=== modified file 'plugin/auth/qa_auth_interface.c'
--- a/plugin/auth/qa_auth_interface.c	2010-10-20 14:56:09 +0000
+++ b/plugin/auth/qa_auth_interface.c	2011-06-30 15:24:13 +0000
@@ -62,11 +62,21 @@ static int qa_auth_interface (MYSQL_PLUG
     if (info->auth_string_length != 14)
        err= CR_ERROR;
 /* To be set by the plugin */
+#ifdef MCP_BUG61709
+/*    if (strcmp(info->authenticated_as, "qa_test_1_user"))
+         err= CR_ERROR; */
+#else
 //    if (strcmp(info->authenticated_as, "qa_test_1_user"))
 //       err= CR_ERROR;
+#endif
 /* To be set by the plugin */
+#ifdef MCP_BUG61709
+/*    if (strcmp(info->external_user, ""))
+         err= CR_ERROR; */
+#else
 //    if (strcmp(info->external_user, ""))
 //       err= CR_ERROR;
+#endif
     if (info->password_used != PASSWORD_USED_YES)
        err= CR_ERROR;
     if (strcmp(info->host_or_ip, "localhost"))
@@ -88,8 +98,13 @@ static int qa_auth_interface (MYSQL_PLUG
     /* Assign with an external account, effect on @@local.EXTERNAL_USER */
      strcpy(info->external_user, "externaluser");
     /* Overwriting will cause a core dump */
+#ifndef MCP_BUG61709
+/*     strcpy(info->host_or_ip, "host_or_ip");
+       info->host_or_ip_length= 10; */
+#else
 //     strcpy(info->host_or_ip, "host_or_ip");
 //     info->host_or_ip_length= 10;
+#endif
   }
 /* Invalid, means too high values for length */
   else if (strcmp(info->user_name, "qa_test_3_user")== 0)
@@ -127,8 +142,13 @@ static int qa_auth_interface (MYSQL_PLUG
 /* This assignment has no effect.*/
      strcpy(info->external_user, "");
     /* Overwriting will cause a core dump */
+#ifndef MCP_BUG61709
+/*     strcpy(info->host_or_ip, "");
+       info->host_or_ip_length= 0; */
+#else
 //     strcpy(info->host_or_ip, "");
 //     info->host_or_ip_length= 0;
+#endif
   }
 /* Set to 'root' */
   else if (strcmp(info->user_name, "qa_test_6_user")== 0)

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2011-05-12 08:43:50 +0000
+++ b/tests/mysql_client_test.c	2011-06-30 15:24:13 +0000
@@ -2189,6 +2189,7 @@ static void test_wl4435_3()
 
   puts("");
 
+#ifdef MCP_BUG61709
   // The following types are not supported:
   //   - ENUM
   //   - SET
@@ -2205,6 +2206,7 @@ static void test_wl4435_3()
   //   - MYSQL_TYPE_YEAR (use MYSQL_TYPE_SHORT instead);
   //   - MYSQL_TYPE_TINY_BLOB, MYSQL_TYPE_MEDIUM_BLOB, MYSQL_TYPE_LONG_BLOB
   //     (use MYSQL_TYPE_BLOB instead);
+#endif
 
   WL4435_TEST("TINYINT", "127",
               MYSQL_TYPE_TINY, MYSQL_TYPE_TINY,

No bundle (reason: useless for push emails).