summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay.choubey@oracle.com>2012-08-07 19:07:13 +0530
committerNirbhay Choubey <nirbhay.choubey@oracle.com>2012-08-07 19:07:13 +0530
commitfb697972b3481e335bb446448dff3076fdcc4cc3 (patch)
tree0f759f6310d21c1917beeb39e70765d26fb2e098 /client/mysql.cc
parent7b343df2891c9c351d1491628ce4df51ded97191 (diff)
parentd4e4538b2de4894f35c556bcaf9baf0a010969a9 (diff)
downloadmariadb-git-fb697972b3481e335bb446448dff3076fdcc4cc3.tar.gz
Merge of patch for Bug#13928675 from mysql-5.1.
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index d7c89d3877b..73787ea5eeb 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1,5 +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
@@ -1179,7 +1179,7 @@ int main(int argc,char *argv[])
mysql_thread_id(&mysql), server_version_string(&mysql));
put_info((char*) glob_buffer.ptr(),INFO_INFO);
- put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"), INFO_INFO);
+ put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
#ifdef HAVE_READLINE
initialize_readline((char*) my_progname);
@@ -1601,7 +1601,7 @@ static void usage(int version)
if (version)
return;
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
printf("Usage: %s [OPTIONS] [database]\n", my_progname);
my_print_help(my_long_options);
print_defaults("my", load_default_groups);