diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 19:07:13 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 19:07:13 +0530 |
| commit | fb697972b3481e335bb446448dff3076fdcc4cc3 (patch) | |
| tree | 0f759f6310d21c1917beeb39e70765d26fb2e098 /client/mysqladmin.cc | |
| parent | 7b343df2891c9c351d1491628ce4df51ded97191 (diff) | |
| parent | d4e4538b2de4894f35c556bcaf9baf0a010969a9 (diff) | |
| download | mariadb-git-fb697972b3481e335bb446448dff3076fdcc4cc3.tar.gz | |
Merge of patch for Bug#13928675 from mysql-5.1.
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 321efd36642..2a1d61395e2 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* + Copyright (c) 2000, 2012, 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 @@ -701,7 +702,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) case ADMIN_VER: new_line=1; print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000")); 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)); @@ -1099,7 +1100,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000")); puts("Administration program for the mysqld daemon."); printf("Usage: %s [OPTIONS] command command....\n", my_progname); my_print_help(my_long_options); |