bzr commit into mysql-trunk branch (build:3329)

[MySQL Build Team]

#At file:///net/helheim/store/bteam/bzr/mysql-5.5-itch/ based on revid:build@stripped

 3329 MySQL Build Team	2011-04-24
      final fix

    modified:
      mysys/default.c
=== modified file 'mysys/default.c'
--- a/mysys/default.c	2011-04-23 00:01:56 +0000
+++ b/mysys/default.c	2011-04-24 00:33:21 +0000
@@ -1071,11 +1071,10 @@ void my_print_default_files(const char *
 
           if (my_defaults_extra_file == pos){
              end[(strlen(end)-1)] = '\0';
-             strxmov(end, " ",  NullS);
+             // strxmov(end, " ",  NullS);
           }
           else
-             strxmov(end, conf_file, *ext , "the other ",  NullS);
-          fputs("\nnew_line", stdout);
+             strxmov(end, conf_file, *ext , " ",  NullS);
           fputs(name, stdout);
         }
       }


Attachment: [text/bzr-bundle] bzr/[e-mail]