From de4a3552e111596800da8db55276a0a9bbe07a1a Mon Sep 17 00:00:00 2001
From: unknown <joerg@mysql.com>
Date: Fri, 13 Jan 2006 16:25:20 +0100
Subject: [PATCH 1/2] extra/comp_err.c  +  scripts/mysqld_multi.sh  : Copyright
 string fixes (bug#16106)

extra/comp_err.c:
  Ensure that the license spelling is as expected by the "mysql_copyright" tool.
  (bug#16106)
scripts/mysqld_multi.sh:
  The "mysql_copyright" tool will not change non-C files, so do not mention the license.
  (bug#16106)
---
 extra/comp_err.c        | 4 +++-
 scripts/mysqld_multi.sh | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/extra/comp_err.c b/extra/comp_err.c
index bd7e6231908..e627a47b21f 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -137,7 +137,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;
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index b75aa1a7c31..21439650ef3 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -624,9 +624,6 @@ sub usage
   print <<EOF;
 $my_progname version $VER by Jani Tolonen
 
-This software comes with ABSOLUTELY NO WARRANTY. This is free software,
-and you are welcome to modify and redistribute it under the GPL license.
-
 Description:
 $my_progname can be used to start, or stop any number of separate
 mysqld processes running in different TCP/IP ports and UNIX sockets.

From db5fe0fc9772d9ab74d12d735cb67ca2fcb8721d Mon Sep 17 00:00:00 2001
From: unknown <joerg@mysql.com>
Date: Mon, 16 Jan 2006 17:23:39 +0100
Subject: [PATCH 2/2] extra/comp_err.c  :  Fix a merge error.

extra/comp_err.c:
  Fix a merge error (closing '}' was lost), correct formatting (tab -> blanks).
---
 extra/comp_err.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extra/comp_err.c b/extra/comp_err.c
index 1083d029f4e..65fc131a5fc 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -542,6 +542,7 @@ static char *parse_default_language(char *str)
     fprintf(stderr,
 	    "Unexpected EOL: No short language name after the keyword\n");
     DBUG_RETURN(0);
+  }
 
   /* reading the short language tag */
   if (!(slang= get_word(&str)))
@@ -877,7 +878,7 @@ static void usage(void)
   print_version();
   printf("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"
+         "and you are welcome to modify and redistribute it under the GPL license.\n"
          "Usage:\n");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);