summaryrefslogtreecommitdiff
path: root/storage/archive
diff options
context:
space:
mode:
authorunknown <timothy.smith@sun.com>2008-11-27 00:02:10 +0100
committerBuild Team <bteam@astra04>2008-11-27 00:02:10 +0100
commit96e0bf50d942258722b25e9d17d209d40eaacd28 (patch)
tree8b74eb8ccd3df7d27cd2c237daeafaf3222fb7eb /storage/archive
parent3d0798d07de937c857c255ce9bfb8c24e10b25e4 (diff)
parent74b354091946336ea8663652d4744b43a2c996e3 (diff)
downloadmariadb-git-96e0bf50d942258722b25e9d17d209d40eaacd28.tar.gz
Merge from mysql-5.1.30-release
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/archive_reader.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/archive/archive_reader.c b/storage/archive/archive_reader.c
index bfc01073161..84d4e318b49 100644
--- a/storage/archive/archive_reader.c
+++ b/storage/archive/archive_reader.c
@@ -374,10 +374,8 @@ static struct my_option my_long_options[] =
static void usage(void)
{
print_version();
- puts("Copyright (C) 2007 MySQL AB");
- 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("Copyright 2007-2008 MySQL AB, 2008 Sun Microsystems, Inc.");
+ 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("Read and modify Archive files directly\n");
printf("Usage: %s [OPTIONS] file_to_be_looked_at [file_for_backup]\n", my_progname);
print_defaults("my", load_default_groups);