diff options
| author | unknown <joerg@mysql.com> | 2006-01-16 16:48:05 +0100 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2006-01-16 16:48:05 +0100 |
| commit | 111cacfc7f02bfd6f497823c659356e1e1456904 (patch) | |
| tree | 18ecbadcac525affbb9ce99ea767d72d79eef286 /scripts | |
| parent | 6bbc50cd857edf7aa1724dbae38c58fb357eb7ef (diff) | |
| parent | ddab016fc46cfbd175fff5b3a5a27f371afad012 (diff) | |
| download | mariadb-git-111cacfc7f02bfd6f497823c659356e1e1456904.tar.gz | |
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_multi.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index b2b85018d7a..2dcc8dc7bc4 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -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. |