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 /sql/mysqld.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 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 90fd1f1e126..d391918c42c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6661,7 +6661,7 @@ static void usage(void) if (!default_collation_name) default_collation_name= (char*) default_charset_info->name; print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000")); puts("Starts the MySQL database server.\n"); printf("Usage: %s [OPTIONS]\n", my_progname); if (!opt_verbose) |