=== modified file 'extra/perror.c'
--- extra/perror.c	2011-06-07 07:53:37 +0000
+++ extra/perror.c	2011-06-30 13:36:04 +0000
@@ -32,7 +32,7 @@ static my_bool verbose, print_all_codes;
 
 #include "../include/my_base.h"
 #include "../mysys/my_handler_errors.h"
-// #include "../include/my_compare.h"
+/* #include "../include/my_compare.h" */
 
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 static my_bool ndb_code;
=== modified file 'plugin/auth/qa_auth_interface.c'
--- plugin/auth/qa_auth_interface.c	2010-10-20 14:56:09 +0000
+++ plugin/auth/qa_auth_interface.c	2011-06-30 13:35:01 +0000
@@ -62,11 +62,11 @@ static int qa_auth_interface (MYSQL_PLUG
     if (info->auth_string_length != 14)
        err= CR_ERROR;
 /* To be set by the plugin */
-//    if (strcmp(info->authenticated_as, "qa_test_1_user"))
-//       err= CR_ERROR;
+/*    if (strcmp(info->authenticated_as, "qa_test_1_user"))
+         err= CR_ERROR; */
 /* To be set by the plugin */
-//    if (strcmp(info->external_user, ""))
-//       err= CR_ERROR;
+/*    if (strcmp(info->external_user, ""))
+         err= CR_ERROR; */
     if (info->password_used != PASSWORD_USED_YES)
        err= CR_ERROR;
     if (strcmp(info->host_or_ip, "localhost"))
@@ -88,8 +88,8 @@ 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 */
-//     strcpy(info->host_or_ip, "host_or_ip");
-//     info->host_or_ip_length= 10;
+/*     strcpy(info->host_or_ip, "host_or_ip");
+       info->host_or_ip_length= 10; */
   }
 /* Invalid, means too high values for length */
   else if (strcmp(info->user_name, "qa_test_3_user")== 0)
@@ -127,8 +127,8 @@ static int qa_auth_interface (MYSQL_PLUG
 /* This assignment has no effect.*/
      strcpy(info->external_user, "");
     /* Overwriting will cause a core dump */
-//     strcpy(info->host_or_ip, "");
-//     info->host_or_ip_length= 0;
+/*     strcpy(info->host_or_ip, "");
+       info->host_or_ip_length= 0; */
   }
 /* Set to 'root' */
   else if (strcmp(info->user_name, "qa_test_6_user")== 0)

=== modified file 'tests/mysql_client_test.c'
--- tests/mysql_client_test.c	2011-06-10 14:26:35 +0000
+++ tests/mysql_client_test.c	2011-06-30 13:38:26 +0000
@@ -2189,23 +2189,23 @@ static void test_wl4435_3()
 
   puts("");
 
-  // The following types are not supported:
-  //   - ENUM
-  //   - SET
-  //
-  // The following types are supported but can not be used for
-  // OUT-parameters:
-  //   - MEDIUMINT;
-  //   - BIT(..);
-  //
-  // The problem is that those types are not supported for IN-parameters,
-  // and OUT-parameters should be bound as IN-parameters before execution.
-  //
-  // The following types should not be used:
-  //   - 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);
-
+  /* The following types are not supported:
+       - ENUM
+       - SET
+  
+     The following types are supported but can not be used for
+     OUT-parameters:
+       - MEDIUMINT;
+       - BIT(..);
+  
+     The problem is that those types are not supported for IN-parameters,
+     and OUT-parameters should be bound as IN-parameters before execution.
+  
+     The following types should not be used:
+       - 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);
+  */
   WL4435_TEST("TINYINT", "127",
               MYSQL_TYPE_TINY, MYSQL_TYPE_TINY,
               char, ,