diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:50:44 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-22 11:50:44 +0400 |
| commit | f636987d3bfcd856d6bf844644c20a179b11d097 (patch) | |
| tree | 1803892d2f884fc5093926d19cf9179cd644c169 /client/mysqladmin.cc | |
| parent | 96a2bbcbdf37b2f543fca1d0d5aee7bf37b31317 (diff) | |
| parent | c4dad60a73b601ee2c5c11c7f691b4ac9b37f3a5 (diff) | |
| download | mariadb-git-f636987d3bfcd856d6bf844644c20a179b11d097.tar.gz | |
Manual merge from mysql-5.1.
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 8826b6713be..3f33c25e664 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -688,7 +688,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, 2010")); + 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)); @@ -1086,7 +1086,7 @@ static void print_version(void) static void usage(void) { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010")); + 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); |