diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:46:45 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:46:45 +0400 |
| commit | c4dad60a73b601ee2c5c11c7f691b4ac9b37f3a5 (patch) | |
| tree | 3c1caacc4212bf46d8923b36979abe10a6e32366 /client/mysqlshow.c | |
| parent | 41258f8e6c46d06e817d55921c66309ae9701799 (diff) | |
| parent | f7618904bf99d98c958216ec4343def04d026ce2 (diff) | |
| download | mariadb-git-c4dad60a73b601ee2c5c11c7f691b4ac9b37f3a5.tar.gz | |
Manual merge from mysql-5.0.
Diffstat (limited to 'client/mysqlshow.c')
| -rw-r--r-- | client/mysqlshow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqlshow.c b/client/mysqlshow.c index c97ae1d8f97..dec31868c0c 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 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,8 +256,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts("Copyright 2000-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(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011)")); 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\ |