From: Luis Soares Date: July 11 2011 4:34pm Subject: bzr push into mysql-5.0 branch (luis.soares:2904 to 2905) Bug#12695969 List-Archive: http://lists.mysql.com/commits/140285 X-Bug: 12695969 Message-Id: <201107111634.p6BGYbvV029790@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2905 Luis Soares 2011-07-11 BUG#12695969: FIX OUTDATED COPYRIGHT NOTICES IN REPLACTION CLIENT TOOLS The fix is to backport part of revision: - alexander.nozdrin@stripped from mysql-5.5. In detail, we add the oracle welcome notice header file proposed in the original patch and include/use it in client/mysqlbinlog.cc, replacing the existing and obsolete notice. added: include/welcome_copyright_notice.h modified: client/mysqlbinlog.cc 2904 Sunanda Menon 2011-07-06 [merge] Merge from mysql-5.0.94-release removed: ndb/test/sql/ ndb/test/sql/test_create_drop.pl ndb/test/sql/test_range_bounds.pl added: mysql-test/r/secure_file_priv_win.result mysql-test/t/secure_file_priv_win-master.opt mysql-test/t/secure_file_priv_win.test modified: mysql-test/mysql-test-run.pl mysql-test/r/explain.result mysql-test/r/loaddata.result mysql-test/r/sp-security.result mysql-test/r/subselect.result mysql-test/t/explain.test mysql-test/t/loaddata.test mysql-test/t/sp-security.test mysql-test/t/subselect.test mysys/my_symlink.c sql/item.cc sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/mysql_priv.h sql/mysqld.cc sql/sp_head.cc sql/sql_class.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_select.cc === modified file 'client/mysqlbinlog.cc' --- a/client/mysqlbinlog.cc 2011-06-30 15:31:31 +0000 +++ b/client/mysqlbinlog.cc 2011-07-11 16:11:41 +0000 @@ -1,6 +1,4 @@ -/* - Copyright (c) 2000-2008 MySQL AB, 2009 Sun Microsystems, Inc. - Use is subject to license terms. +/* Copyright (c) 2000, 2011, 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 @@ -39,6 +37,7 @@ #include "mysql_priv.h" #include "log_event.h" #include "sql_common.h" +#include // ORACLE_WELCOME_COPYRIGHT_NOTICE #define BIN_LOG_HEADER_SIZE 4 #define PROBE_HEADER_LEN (EVENT_LEN_OFFSET+4) @@ -859,10 +858,7 @@ static void print_version() static void usage() { print_version(); - puts("By Monty and Sasha, for your professional use\n\ -This software comes with NO WARRANTY: This is free software,\n\ -and you are welcome to modify and redistribute it under the GPL license\n"); - + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); printf("\ Dumps a MySQL binary log in a format usable for viewing or for piping to\n\ the mysql command line client\n\n"); === added file 'include/welcome_copyright_notice.h' --- a/include/welcome_copyright_notice.h 1970-01-01 00:00:00 +0000 +++ b/include/welcome_copyright_notice.h 2011-07-11 16:11:41 +0000 @@ -0,0 +1,31 @@ +/* Copyright (c) 2011, 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 + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#ifndef _welcome_copyright_notice_h_ +#define _welcome_copyright_notice_h_ + +/* + This define specifies copyright notice which is displayed by every MySQL + program on start, or on help screen. +*/ + +#define ORACLE_WELCOME_COPYRIGHT_NOTICE(years) \ + "Copyright (c) " years ", Oracle and/or its affiliates. All rights reserved.\n" \ + "\n" \ + "Oracle is a registered trademark of Oracle Corporation and/or its\n" \ + "affiliates. Other names may be trademarks of their respective\n" \ + "owners.\n" + +#endif /* _welcome_copyright_notice_h_ */ No bundle (reason: useless for push emails).