Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1

extra/comp_err.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged

1 files changed, 3 insertions, 1 deletions

diff --git a/extra/comp_err.c b/extra/comp_err.c
index 6c7fad6a270..f47c8a1beca 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -159,7 +159,9 @@ static void get_options(register int *argc,register char **argv[])
     case 'I':
     case '?':
       printf("         %s  (Compile errormessage)  Ver 1.3\n",progname);
-      puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
+      puts("This software comes with ABSOLUTELY NO WARRANTY. "
+           "This is free software,\n"
+           "and you are welcome to modify and redistribute it under the GPL license.\n");
       printf("Usage:   %s [-?] [-I] [-V] fromfile[s] tofile\n",progname);
       puts("Options: -Info -Version\n");
       help=1;