1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge of the fix for bug#16106.

Browse Source 
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
This commit is contained in:
joerg@mysql.com 2006-01-16 16:48:05 +01:00
commit fa91e05bf5
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extra/comp_err.c
View File

@ -542,7 +542,6 @@ static char *parse_default_language(char *str)
fprintf(stderr, fprintf(stderr,
"Unexpected EOL: No short language name after the keyword\n"); "Unexpected EOL: No short language name after the keyword\n");
DBUG_RETURN(0); DBUG_RETURN(0);
}
/* reading the short language tag */ /* reading the short language tag */
if (!(slang= get_word(&str))) if (!(slang= get_word(&str)))
@ -876,9 +875,10 @@ static void usage(void)
{ {
DBUG_ENTER("usage"); DBUG_ENTER("usage");
print_version(); print_version();
printf("This software comes with ABSOLUTELY NO WARRANTY. This is free " printf("This software comes with ABSOLUTELY NO WARRANTY. "
"software,\nand you are welcome to modify and redistribute it under " "This is free software,\n"
"the GPL license\nUsage:\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_help(my_long_options);
my_print_variables(my_long_options); my_print_variables(my_long_options);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;

3
scripts/mysqld_multi.sh
View File

@ -763,9 +763,6 @@ sub usage
print <<EOF; print <<EOF;
$my_progname version $VER by Jani Tolonen $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: Description:
$my_progname can be used to start, or stop any number of separate $my_progname can be used to start, or stop any number of separate
mysqld processes running in different TCP/IP ports and UNIX sockets. mysqld processes running in different TCP/IP ports and UNIX sockets.