From: Date: January 13 2006 4:25pm
Subject: bk commit into 4.0 tree (joerg:1.2170) BUG#16106
List-Archive: http://lists.mysql.com/commits/1038
X-Bug: 16106
Message-Id: <20060113152523.C081B16EAB@trift2.fambruehe>

Below is the list of changes that have just been committed into a local
4.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2170 06/01/13 16:25:20 joerg@stripped +2 -0
  extra/comp_err.c  +  scripts/mysqld_multi.sh  :
  Copyright string fixes (bug#16106)

  scripts/mysqld_multi.sh
    1.14 06/01/13 16:24:25 joerg@stripped +0 -3
    The "mysql_copyright" tool will not change non-C files, so do not mention the license.
    (bug#16106)

  extra/comp_err.c
    1.9 06/01/13 16:24:25 joerg@stripped +3 -1
    Ensure that the license spelling is as expected by the "mysql_copyright" tool.
    (bug#16106)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M40/push-4.0

--- 1.8/extra/comp_err.c	2003-09-23 12:36:23 +02:00
+++ 1.9/extra/comp_err.c	2006-01-13 16:24:25 +01:00
@@ -137,7 +137,9 @@
     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;

--- 1.13/scripts/mysqld_multi.sh	2004-04-09 08:59:01 +02:00
+++ 1.14/scripts/mysqld_multi.sh	2006-01-13 16:24:25 +01:00
@@ -624,9 +624,6 @@
   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.