summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-04-24 12:11:49 +0300
committerunknown <monty@hundin.mysql.fi>2002-04-24 12:11:49 +0300
commitd12b458c55e928ad72f3d4bcbba594ebb7f3884c (patch)
tree14fef89af45071919fd86811268862b08899ddb5 /client
parentdfab963712a20fb0bd3ab6ee1bd7f46bea77594f (diff)
parentd058832ff4780916285946a6de7989ff476cadf7 (diff)
downloadmariadb-git-d12b458c55e928ad72f3d4bcbba594ebb7f3884c.tar.gz
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi: Auto merged
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 3d30283d13a..145c8b847ff 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -54,6 +54,7 @@ static struct option long_options[] =
{"table", required_argument, 0, 't'},
{"user", required_argument, 0, 'u'},
{"version", no_argument, 0, 'V'},
+ {0,0,0,0}
};
void sql_print_error(const char *format,...);
@@ -102,15 +103,16 @@ static void die(const char* fmt, ...)
static void print_version()
{
- printf("%s Ver 1.7 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
+ printf("%s Ver 1.8 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE);
}
static void usage()
{
print_version();
- puts("By Sasha, for your professional use\n\
-This software comes with NO WARRANTY: see the file PUBLIC for details\n");
+ puts("By Monty and Sasha, for your professional use\n\
+This software comes with NO WARRANTY: This is free software,\n\
+and you are welcome to modify and redistribute it under the GPL license\n");
printf("\
Dumps a MySQL binary log in a format usable for viewing or for pipeing to\n\