diff options
author | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
---|---|---|
committer | unknown <timour@askmonty.org> | 2012-11-09 10:11:20 +0200 |
commit | 3f590335363dec43e301fac174f9349233f5804c (patch) | |
tree | 4c3b3e4f9f71cf31cc18cf7d0ba48a3ef3b5c2d3 /client/mysqlshow.c | |
parent | 94cae65774194f8769b18e6943713d1fed5f89fa (diff) | |
parent | 8df490044cf6fd4a7bcb38cab509975b39b1216d (diff) | |
download | mariadb-git-3f590335363dec43e301fac174f9349233f5804c.tar.gz |
Merge MariaDB 5.1.66 -> 5.2 -> 5.3
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 e1cbfcb9404..7d73c0108cf 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; @@ -256,9 +257,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\ |