Skip to content

Commit d4e4538

Browse files
author
Nirbhay Choubey
committed
Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST
 SHOW 2012 INSTEAD OF 2011 * Added a new macro to hold the current year : COPYRIGHT_NOTICE_CURRENT_YEAR * Modified ORACLE_WELCOME_COPYRIGHT_NOTICE macro to take the initial year as parameter and pick current year from the above mentioned macro.
1 parent a9acf42 commit d4e4538

14 files changed

Lines changed: 40 additions & 34 deletions

‎client/mysql.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -1170,7 +1170,7 @@ int main(int argc,char *argv[])
11701170
mysql_thread_id(&mysql), server_version_string(&mysql));
11711171
put_info((char*) glob_buffer.ptr(),INFO_INFO);
11721172

1173-
put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"), INFO_INFO);
1173+
put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
11741174

11751175
#ifdef HAVE_READLINE
11761176
initialize_readline((char*) my_progname);
@@ -1589,7 +1589,7 @@ static void usage(int version)
15891589

15901590
if (version)
15911591
return;
1592-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1592+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
15931593
printf("Usage: %s [OPTIONS] [database]\n", my_progname);
15941594
my_print_help(my_long_options);
15951595
print_defaults("my", load_default_groups);

‎client/mysql_upgrade.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -230,7 +230,7 @@ get_one_option(int optid, const struct my_option *opt,
230230
switch (optid) {
231231

232232
case '?':
233-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
233+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
234234
printf("%s Ver %s Distrib %s, for %s (%s)\n",
235235
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
236236
puts("MySQL utility for upgrading databases to new MySQL versions.\n");

‎client/mysqladmin.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -693,7 +693,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
693693
case ADMIN_VER:
694694
new_line=1;
695695
print_version();
696-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
696+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
697697
printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
698698
printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
699699
printf("Connection\t\t%s\n",mysql_get_host_info(mysql));
@@ -1072,7 +1072,7 @@ static void print_version(void)
10721072
static void usage(void)
10731073
{
10741074
print_version();
1075-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1075+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
10761076
puts("Administration program for the mysqld daemon.");
10771077
printf("Usage: %s [OPTIONS] command command....\n", my_progname);
10781078
my_print_help(my_long_options);

‎client/mysqlbinlog.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ static void print_version()
12741274
static void usage()
12751275
{
12761276
print_version();
1277-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1277+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
12781278
printf("\
12791279
Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
12801280
the mysql command line client.\n\n");

‎client/mysqlcheck.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -222,7 +222,7 @@ static void print_version(void)
222222
static void usage(void)
223223
{
224224
print_version();
225-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
225+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
226226
puts("This program can be used to CHECK (-c, -m, -C), REPAIR (-r), ANALYZE (-a),");
227227
puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");
228228
puts("used at the same time. Not all options are supported by all storage engines.");

‎client/mysqldump.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ static void short_usage_sub(void)
585585
static void usage(void)
586586
{
587587
print_version();
588-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
588+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
589589
puts("Dumping structure and contents of MySQL databases and tables.");
590590
short_usage_sub();
591591
print_defaults("my",load_default_groups);

‎client/mysqlimport.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -196,7 +196,7 @@ static void print_version(void)
196196
static void usage(void)
197197
{
198198
print_version();
199-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
199+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
200200
printf("\
201201
Loads tables from text files in various formats. The base name of the\n\
202202
text file must be the name of the table that should be used.\n\

‎client/mysqlshow.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -256,7 +256,7 @@ static void print_version(void)
256256
static void usage(void)
257257
{
258258
print_version();
259-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011)"));
259+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
260260
puts("Shows the structure of a MySQL database (databases, tables, and columns).\n");
261261
printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
262262
puts("\n\

‎client/mysqlslap.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -95,6 +95,7 @@
9595
#include <sys/wait.h>
9696
#endif
9797
#include <ctype.h>
98+
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
9899

99100
#ifdef __WIN__
100101
#define srandom srand
@@ -691,8 +692,7 @@ static void print_version(void)
691692
static void usage(void)
692693
{
693694
print_version();
694-
puts("Copyright (C) 2005 MySQL AB");
695-
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");
695+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005"));
696696
puts("Run a query multiple times against the server.\n");
697697
printf("Usage: %s [OPTIONS]\n",my_progname);
698698
print_defaults("my",load_default_groups);

‎client/mysqltest.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6135,7 +6135,7 @@ void print_version(void)
61356135
void usage()
61366136
{
61376137
print_version();
6138-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
6138+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
61396139
printf("Runs a test against the mysql server and compares output with a results file.\n\n");
61406140
printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
61416141
my_print_help(my_long_options);

0 commit comments

Comments
 (0)