diff options
author | unknown <timour@askmonty.org> | 2012-11-06 11:52:55 +0200 |
---|---|---|
committer | unknown <timour@askmonty.org> | 2012-11-06 11:52:55 +0200 |
commit | 7c23d6d0c66cb3b84cb466f956e19bfea0acc342 (patch) | |
tree | 551dd23a43a26923a6dd30096a2822a27a90f355 /client/mysqlshow.c | |
parent | 43293b7a515dbb2cf04907e2d98bcc813279cad8 (diff) | |
parent | 813b661d00123e3291530d102e2b94388f42fb0f (diff) | |
download | mariadb-git-7c23d6d0c66cb3b84cb466f956e19bfea0acc342.tar.gz |
Merge MySQL 5.1.66 -> MariaDB 5.1.65
Diffstat (limited to 'client/mysqlshow.c')
-rw-r--r-- | client/mysqlshow.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/mysqlshow.c b/client/mysqlshow.c index 955cfe4442a..8b3628289d3 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2000, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ #include <signal.h> #include <stdarg.h> #include <sslopt-vars.h> +#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ static char * host=0, *opt_password=0, *user=0; static my_bool opt_show_keys= 0, opt_compress= 0, opt_count=0, opt_status= 0; @@ -255,9 +256,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts("Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc."); - puts("Copyright 2008-2011 Oracle and Monty Program 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(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000")); puts("Shows the structure of a MySQL database (databases, tables, and columns).\n"); printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname); puts("\n\ |