3722 Tor Didriksen 2012-03-27
Bug#13887284 MYSQL CLIENT COPYRIGHT NOTICE MUST SHOW 2012 INSTEAD OF 2011
modified:
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
client/mysqltest.cc
extra/innochecksum.cc
extra/perror.c
include/welcome_copyright_notice.h
sql/gen_lex_hash.cc
sql/mysqld.cc
storage/perfschema/gen_pfs_lex_token.cc
support-files/build-tags
3721 Joerg Bruehe 2012-03-21
Update copyright year for Windows installer: This is 2012.
Bug #13860319 COPYRIGHT NOTICE MUST SHOW 2012 INSTEAD OF 2011
modified:
packaging/WiX/custom_ui.wxs
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc 2011-12-12 12:55:18 +0000
+++ b/client/mysql.cc 2012-03-27 10:53:19 +0000
@@ -1297,7 +1297,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, 2012"), INFO_INFO);
#ifdef HAVE_READLINE
initialize_readline((char*) my_progname);
@@ -1727,7 +1727,7 @@ static void usage(int version)
if (version)
return;
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
printf("Usage: %s [OPTIONS] [database]\n", my_progname);
my_print_help(my_long_options);
print_defaults("my", load_default_groups);
=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c 2012-01-12 13:22:52 +0000
+++ b/client/mysql_upgrade.c 2012-03-27 10:53:19 +0000
@@ -246,7 +246,7 @@ get_one_option(int optid, const struct m
case '?':
printf("%s Ver %s Distrib %s, for %s (%s)\n",
my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
puts("MySQL utility for upgrading databases to new MySQL versions.\n");
my_print_help(my_long_options);
exit(0);
=== modified file 'client/mysqladmin.cc'
--- a/client/mysqladmin.cc 2011-11-15 14:27:21 +0000
+++ b/client/mysqladmin.cc 2012-03-27 10:53:19 +0000
@@ -703,7 +703,7 @@ static int execute_commands(MYSQL *mysql
case ADMIN_VER:
new_line=1;
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
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));
@@ -1101,7 +1101,7 @@ static void print_version(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
puts("Administration program for the mysqld daemon.");
printf("Usage: %s [OPTIONS] command command....\n", my_progname);
my_print_help(my_long_options);
=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc 2012-02-10 18:40:40 +0000
+++ b/client/mysqlbinlog.cc 2012-03-27 10:53:19 +0000
@@ -1468,7 +1468,7 @@ static void print_version()
static void usage()
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
printf("\
Dumps a MySQL binary log in a format usable for viewing or for piping to\n\
the mysql command line client.\n\n");
=== modified file 'client/mysqlcheck.c'
--- a/client/mysqlcheck.c 2011-11-15 14:27:21 +0000
+++ b/client/mysqlcheck.c 2012-03-27 10:53:19 +0000
@@ -228,7 +228,7 @@ static void print_version(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
puts("This program can be used to CHECK (-c, -m, -C), REPAIR (-r), ANALYZE (-a),");
puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");
puts("used at the same time. Not all options are supported by all storage engines.");
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c 2012-02-16 09:51:14 +0000
+++ b/client/mysqldump.c 2012-03-27 10:53:19 +0000
@@ -612,7 +612,7 @@ static void short_usage_sub(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
puts("Dumping structure and contents of MySQL databases and tables.");
short_usage_sub();
print_defaults("my",load_default_groups);
=== modified file 'client/mysqlimport.c'
--- a/client/mysqlimport.c 2011-11-15 14:27:21 +0000
+++ b/client/mysqlimport.c 2012-03-27 10:53:19 +0000
@@ -203,7 +203,7 @@ static void print_version(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
printf("\
Loads tables from text files in various formats. The base name of the\n\
text file must be the name of the table that should be used.\n\
=== modified file 'client/mysqlshow.c'
--- a/client/mysqlshow.c 2011-11-15 14:27:21 +0000
+++ b/client/mysqlshow.c 2012-03-27 10:53:19 +0000
@@ -277,7 +277,7 @@ static void print_version(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011)"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012)"));
puts("Shows the structure of a MySQL database (databases, tables, and columns).\n");
printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);
puts("\n\
=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c 2011-11-15 14:27:21 +0000
+++ b/client/mysqlslap.c 2012-03-27 10:53:19 +0000
@@ -708,7 +708,7 @@ static void print_version(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005, 2010"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2005, 2012"));
puts("Run a query multiple times against the server.\n");
printf("Usage: %s [OPTIONS]\n",my_progname);
print_defaults("my",load_default_groups);
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc 2012-02-29 11:17:52 +0000
+++ b/client/mysqltest.cc 2012-03-27 10:53:19 +0000
@@ -6604,7 +6604,7 @@ void print_version(void)
void usage()
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
printf("Runs a test against the mysql server and compares output with a results file.\n\n");
printf("Usage: %s [OPTIONS] [database] < test_file\n", my_progname);
my_print_help(my_long_options);
=== modified file 'extra/innochecksum.cc'
--- a/extra/innochecksum.cc 2011-11-22 00:35:48 +0000
+++ b/extra/innochecksum.cc 2012-03-27 10:53:19 +0000
@@ -152,7 +152,7 @@ static void print_version(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
printf("InnoDB offline file checksum utility.\n");
printf("Usage: %s [-c] [-s <start page>] [-e <end page>] [-p <page>] [-v] [-d] <filename>\n", my_progname);
my_print_help(innochecksum_options);
=== modified file 'extra/perror.c'
--- a/extra/perror.c 2011-09-20 14:24:18 +0000
+++ b/extra/perror.c 2012-03-27 10:53:19 +0000
@@ -84,7 +84,7 @@ static void print_version(void)
static void usage(void)
{
print_version();
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
printf("Print a description for a system error code or a MySQL error code.\n");
printf("If you want to get the error for a negative error code, you should use\n-- before the first error code to tell perror that there was no more options.\n\n");
printf("Usage: %s [OPTIONS] [ERRORCODE [ERRORCODE...]]\n",my_progname);
=== modified file 'include/welcome_copyright_notice.h'
--- a/include/welcome_copyright_notice.h 2012-02-16 09:51:14 +0000
+++ b/include/welcome_copyright_notice.h 2012-03-27 10:53:19 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 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
=== modified file 'sql/gen_lex_hash.cc'
--- a/sql/gen_lex_hash.cc 2011-07-22 08:10:35 +0000
+++ b/sql/gen_lex_hash.cc 2012-03-27 10:53:19 +0000
@@ -377,7 +377,7 @@ int main(int argc,char **argv)
printf("/*\n\n Do " "not " "edit " "this " "file " "directly!\n\n*/\n");
puts("/*");
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2012"));
puts("*/");
/* Broken up to indicate that it's not advice to you, gentle reader. */
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2012-03-12 16:13:37 +0000
+++ b/sql/mysqld.cc 2012-03-27 10:53:19 +0000
@@ -7374,7 +7374,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, 2012"));
puts("Starts the MySQL database server.\n");
printf("Usage: %s [OPTIONS]\n", my_progname);
if (!opt_verbose)
=== modified file 'storage/perfschema/gen_pfs_lex_token.cc'
--- a/storage/perfschema/gen_pfs_lex_token.cc 2012-02-06 02:41:36 +0000
+++ b/storage/perfschema/gen_pfs_lex_token.cc 2012-03-27 10:53:19 +0000
@@ -243,7 +243,7 @@ void print_tokens()
int main(int argc,char **argv)
{
puts("/*");
- puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2011"));
+ puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2011, 2012"));
puts("*/");
printf("/*\n");
=== modified file 'support-files/build-tags'
--- a/support-files/build-tags 2011-05-26 15:20:09 +0000
+++ b/support-files/build-tags 2012-03-27 10:53:19 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
rm -f TAGS
-filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|\.yy$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|\.yy$\|\.hpp$'
list="find . -type f"
bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (tor.didriksen:3721 to 3722) Bug#13887284 | Tor Didriksen | 27 Mar |
