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/mysqladmin.cc | |
| parent | 41258f8e6c46d06e817d55921c66309ae9701799 (diff) | |
| parent | f7618904bf99d98c958216ec4343def04d026ce2 (diff) | |
| download | mariadb-git-c4dad60a73b601ee2c5c11c7f691b4ac9b37f3a5.tar.gz | |
Manual merge from mysql-5.0.
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 899c6571fb4..1613e1a42c3 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -25,6 +25,7 @@ #include <sys/stat.h> #include <mysql.h> #include <sql_common.h> +#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */ #define ADMIN_VERSION "8.42" #define MAX_MYSQL_VAR 512 @@ -692,8 +693,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) case ADMIN_VER: new_line=1; 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")); printf("Server version\t\t%s\n", mysql_get_server_info(mysql)); printf("Protocol version\t%d\n", mysql_get_proto_info(mysql)); printf("Connection\t\t%s\n",mysql_get_host_info(mysql)); @@ -1072,8 +1072,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("Administration program for the mysqld daemon."); printf("Usage: %s [OPTIONS] command command....\n", my_progname); my_print_help(my_long_options); |