List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 16 2006 3:48pm
Subject:bk commit into 5.0 tree (joerg:1.2017) BUG#16106
View as plain text  
Below is the list of changes that have just been committed into a local
5.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.2017 06/01/16 16:48:05 joerg@stripped +2 -0
  Manual merge of the fix for bug#16106.
  
  Currently failing tests (for me) in non-debug build:
  blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi

  extra/comp_err.c
    1.22 06/01/16 16:48:00 joerg@stripped +4 -7
    Manual merge: From 4.1 to 5.0, the license line was moved to a different place.

  scripts/mysqld_multi.sh
    1.29 06/01/13 20:59:35 joerg@stripped +0 -0
    Auto merged

# 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:	/M50/merge-5.0/RESYNC

--- 1.21/extra/comp_err.c	2005-10-05 19:06:28 +02:00
+++ 1.22/extra/comp_err.c	2006-01-16 16:48:00 +01:00
@@ -542,7 +542,6 @@
     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)))
@@ -876,9 +875,10 @@
 {
   DBUG_ENTER("usage");
   print_version();
-  printf("This software comes with ABSOLUTELY NO WARRANTY. This is free "
-	 "software,\nand you are welcome to modify and redistribute it under "
-	 "the GPL license\nUsage:\n");
+  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"
+         "Usage:\n");
   my_print_help(my_long_options);
   my_print_variables(my_long_options);
   DBUG_VOID_RETURN;

--- 1.28/scripts/mysqld_multi.sh	2005-09-30 13:02:15 +02:00
+++ 1.29/scripts/mysqld_multi.sh	2006-01-13 20:59:35 +01:00
@@ -763,9 +763,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.
Thread
bk commit into 5.0 tree (joerg:1.2017) BUG#16106Joerg Bruehe16 Jan