Commit 111cacfc authored by unknown's avatar unknown
Browse files

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


scripts/mysqld_multi.sh:
  Auto merged
extra/comp_err.c:
  Manual merge: From 4.1 to 5.0, the license line was moved to a different place.
parents 6bbc50cd ddab016f

extra/comp_err.c

+4 −4
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ 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)))
@@ -876,9 +875,10 @@ static void usage(void) 
{

  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;

scripts/mysqld_multi.sh

+0 −3
Original line number Diff line number Diff line
@@ -763,9 +763,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.