Skip to content

Commit fb69797

Browse files
author
Nirbhay Choubey
committed
Merge of patch for Bug#13928675 from mysql-5.1.
2 parents 7b343df + d4e4538 commit fb69797

14 files changed

Lines changed: 39 additions & 36 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
@@ -1179,7 +1179,7 @@ int main(int argc,char *argv[])
11791179
mysql_thread_id(&mysql), server_version_string(&mysql));
11801180
put_info((char*) glob_buffer.ptr(),INFO_INFO);
11811181

1182-
put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"), INFO_INFO);
1182+
put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
11831183

11841184
#ifdef HAVE_READLINE
11851185
initialize_readline((char*) my_progname);
@@ -1601,7 +1601,7 @@ static void usage(int version)
16011601

16021602
if (version)
16031603
return;
1604-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1604+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
16051605
printf("Usage: %s [OPTIONS] [database]\n", my_progname);
16061606
my_print_help(my_long_options);
16071607
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
@@ -245,7 +245,7 @@ get_one_option(int optid, const struct my_option *opt,
245245
case '?':
246246
printf("%s Ver %s Distrib %s, for %s (%s)\n",
247247
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
248-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010"));
248+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
249249
puts("MySQL utility for upgrading databases to new MySQL versions.\n");
250250
my_print_help(my_long_options);
251251
exit(0);

‎client/mysqladmin.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
1+
/*
2+
Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
23
34
This program is free software; you can redistribute it and/or modify
45
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)
701702
case ADMIN_VER:
702703
new_line=1;
703704
print_version();
704-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
705+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
705706
printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
706707
printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
707708
printf("Connection\t\t%s\n",mysql_get_host_info(mysql));
@@ -1099,7 +1100,7 @@ static void print_version(void)
10991100
static void usage(void)
11001101
{
11011102
print_version();
1102-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1103+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
11031104
puts("Administration program for the mysqld daemon.");
11041105
printf("Usage: %s [OPTIONS] command command....\n", my_progname);
11051106
my_print_help(my_long_options);

‎client/mysqlbinlog.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ static void print_version()
12851285
static void usage()
12861286
{
12871287
print_version();
1288-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
1288+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
12891289
printf("\
12901290
Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
12911291
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
@@ -224,7 +224,7 @@ static void print_version(void)
224224
static void usage(void)
225225
{
226226
print_version();
227-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
227+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
228228
puts("This program can be used to CHECK (-c, -m, -C), REPAIR (-r), ANALYZE (-a),");
229229
puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");
230230
puts("used at the same time. Not all options are supported by all storage engines.");

‎client/mysqldump.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555

5656
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
5757

58-
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
59-
6058
/* Exit codes */
6159

6260
#define EX_USAGE 1
@@ -614,7 +612,7 @@ static void short_usage_sub(void)
614612
static void usage(void)
615613
{
616614
print_version();
617-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
615+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
618616
puts("Dumping structure and contents of MySQL databases and tables.");
619617
short_usage_sub();
620618
print_defaults("my",load_default_groups);

‎client/mysqlimport.c‎

Lines changed: 2 additions & 4 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
@@ -38,8 +38,6 @@ pthread_mutex_t counter_mutex;
3838
pthread_cond_t count_threshhold;
3939
#endif
4040

41-
#include <welcome_copyright_notice.h> /* ORACLE_WELCOME_COPYRIGHT_NOTICE */
42-
4341
static void db_error_with_table(MYSQL *mysql, char *table);
4442
static void db_error(MYSQL *mysql);
4543
static char *field_escape(char *to,const char *from,uint length);
@@ -199,7 +197,7 @@ static void print_version(void)
199197
static void usage(void)
200198
{
201199
print_version();
202-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
200+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
203201
printf("\
204202
Loads tables from text files in various formats. The base name of the\n\
205203
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
@@ -264,7 +264,7 @@ static void print_version(void)
264264
static void usage(void)
265265
{
266266
print_version();
267-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011)"));
267+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
268268
puts("Shows the structure of a MySQL database (databases, tables, and columns).\n");
269269
printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
270270
puts("\n\

‎client/mysqlslap.c‎

Lines changed: 2 additions & 2 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
@@ -710,7 +710,7 @@ static void print_version(void)
710710
static void usage(void)
711711
{
712712
print_version();
713-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005, 2010"));
713+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005"));
714714
puts("Run a query multiple times against the server.\n");
715715
printf("Usage: %s [OPTIONS]\n",my_progname);
716716
print_defaults("my",load_default_groups);

‎client/mysqltest.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6605,7 +6605,7 @@ void print_version(void)
66056605
void usage()
66066606
{
66076607
print_version();
6608-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
6608+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"));
66096609
printf("Runs a test against the mysql server and compares output with a results file.\n\n");
66106610
printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
66116611
my_print_help(my_long_options);

0 commit comments

Comments
 (0)