From: Kent Boortz Date: February 16 2012 11:17am Subject: bzr push into mysql-5.5 branch (kent.boortz:3719 to 3720) List-Archive: http://lists.mysql.com/commits/142905 Message-Id: <20120216111707.D6DA0F018F@tyr80.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3720 Kent Boortz 2012-02-16 [merge] Merge 3719 Kent Boortz 2012-02-16 [merge] Merge modified: storage/innobase/handler/ha_innodb.cc storage/innobase/include/log0log.h storage/innobase/include/mtr0mtr.h storage/innobase/log/log0log.c storage/innobase/mtr/mtr0mtr.c storage/innobase/row/row0ins.c storage/innobase/row/row0upd.c === modified file 'CMakeLists.txt' --- a/CMakeLists.txt 2012-01-16 11:39:12 +0000 +++ b/CMakeLists.txt 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 'client/CMakeLists.txt' --- a/client/CMakeLists.txt 2011-09-21 10:40:41 +0000 +++ b/client/CMakeLists.txt 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 === modified file 'client/mysql_plugin.c' --- a/client/mysql_plugin.c 2012-01-24 16:08:57 +0000 +++ b/client/mysql_plugin.c 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 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 'client/mysqldump.c' --- a/client/mysqldump.c 2012-01-17 03:52:51 +0000 +++ b/client/mysqldump.c 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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 'client/sql_string.cc' --- a/client/sql_string.cc 2011-11-01 06:52:04 +0000 +++ b/client/sql_string.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + 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 === modified file 'cmake/build_configurations/mysql_release.cmake' --- a/cmake/build_configurations/mysql_release.cmake 2011-07-04 12:27:08 +0000 +++ b/cmake/build_configurations/mysql_release.cmake 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 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 === modified file 'cmake/install_macros.cmake' --- a/cmake/install_macros.cmake 2011-12-15 09:44:33 +0000 +++ b/cmake/install_macros.cmake 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 === modified file 'include/m_ctype.h' --- a/include/m_ctype.h 2012-01-23 09:23:50 +0000 +++ b/include/m_ctype.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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 'include/my_global.h' --- a/include/my_global.h 2012-01-16 10:04:28 +0000 +++ b/include/my_global.h 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2001, 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 'include/myisam.h' --- a/include/myisam.h 2012-02-02 12:47:14 +0000 +++ b/include/myisam.h 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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 'include/mysql/plugin.h' --- a/include/mysql/plugin.h 2011-08-15 18:12:11 +0000 +++ b/include/mysql/plugin.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 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 === modified file 'include/welcome_copyright_notice.h' --- a/include/welcome_copyright_notice.h 2011-07-11 16:19:56 +0000 +++ b/include/welcome_copyright_notice.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 === modified file 'libmysql/CMakeLists.txt' --- a/libmysql/CMakeLists.txt 2012-01-30 09:08:22 +0000 +++ b/libmysql/CMakeLists.txt 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 'libmysqld/CMakeLists.txt' --- a/libmysqld/CMakeLists.txt 2011-12-02 13:16:48 +0000 +++ b/libmysqld/CMakeLists.txt 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 === modified file 'libmysqld/examples/CMakeLists.txt' --- a/libmysqld/examples/CMakeLists.txt 2011-07-19 07:35:14 +0000 +++ b/libmysqld/examples/CMakeLists.txt 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 === modified file 'mysql-test/CMakeLists.txt' --- a/mysql-test/CMakeLists.txt 2011-09-29 08:42:23 +0000 +++ b/mysql-test/CMakeLists.txt 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 === modified file 'mysql-test/include/mtr_check.sql' --- a/mysql-test/include/mtr_check.sql 2011-10-05 13:14:14 +0000 +++ b/mysql-test/include/mtr_check.sql 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ --- Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +-- Copyright (c) 2008, 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 === modified file 'mysql-test/mysql-stress-test.pl' --- a/mysql-test/mysql-stress-test.pl 2011-09-15 10:34:32 +0000 +++ b/mysql-test/mysql-stress-test.pl 2012-02-16 09:48:16 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 Library General Public === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2012-01-31 12:16:45 +0000 +++ b/mysql-test/mysql-test-run.pl 2012-02-16 09:48:16 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- cperl -*- -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 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 'mysys/charset-def.c' --- a/mysys/charset-def.c 2012-01-23 09:23:50 +0000 +++ b/mysys/charset-def.c 2012-02-16 09:48:16 +0000 @@ -1,5 +1,4 @@ -/* Copyright (c) 2000, 2003-2007 MySQL AB, 2009, 2010 Sun Microsystems, Inc. - Use is subject to license terms. +/* Copyright (c) 2000, 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 'mysys/my_init.c' --- a/mysys/my_init.c 2012-01-31 07:00:31 +0000 +++ b/mysys/my_init.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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 'mysys/my_symlink.c' --- a/mysys/my_symlink.c 2011-07-07 09:42:14 +0000 +++ b/mysys/my_symlink.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2001, 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 === modified file 'plugin/auth/dialog.c' --- a/plugin/auth/dialog.c 2011-08-15 18:12:11 +0000 +++ b/plugin/auth/dialog.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 === modified file 'plugin/auth/qa_auth_interface.c' --- a/plugin/auth/qa_auth_interface.c 2011-08-15 18:12:11 +0000 +++ b/plugin/auth/qa_auth_interface.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 === modified file 'plugin/auth/qa_auth_server.c' --- a/plugin/auth/qa_auth_server.c 2011-08-15 18:12:11 +0000 +++ b/plugin/auth/qa_auth_server.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 === modified file 'plugin/daemon_example/CMakeLists.txt' --- a/plugin/daemon_example/CMakeLists.txt 2011-09-21 10:40:41 +0000 +++ b/plugin/daemon_example/CMakeLists.txt 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 === modified file 'plugin/daemon_example/daemon_example.cc' --- a/plugin/daemon_example/daemon_example.cc 2011-08-15 18:12:11 +0000 +++ b/plugin/daemon_example/daemon_example.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 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 === modified file 'scripts/mysql_install_db.pl.in' --- a/scripts/mysql_install_db.pl.in 2011-09-06 16:20:04 +0000 +++ b/scripts/mysql_install_db.pl.in 2012-02-15 16:21:38 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/perl # -*- cperl -*- # -# Copyright (C) 2007 MySQL AB +# Copyright (c) 2007, 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 === modified file 'scripts/mysql_install_db.sh' --- a/scripts/mysql_install_db.sh 2011-09-06 15:57:32 +0000 +++ b/scripts/mysql_install_db.sh 2012-02-16 09:48:16 +0000 @@ -1,6 +1,5 @@ #!/bin/sh -# Copyright (c) 2000-2008 MySQL AB, 2009, 2010 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 === modified file 'sql-common/my_time.c' --- a/sql-common/my_time.c 2012-01-24 09:24:05 +0000 +++ b/sql-common/my_time.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 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/ha_ndbcluster.h' --- a/sql/ha_ndbcluster.h 2011-06-30 15:46:53 +0000 +++ b/sql/ha_ndbcluster.h 2012-02-16 09:48:16 +0000 @@ -1,8 +1,7 @@ #ifndef HA_NDBCLUSTER_INCLUDED #define HA_NDBCLUSTER_INCLUDED -/* Copyright (c) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc. - Use is subject to license terms. +/* Copyright (c) 2000, 2010, 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/ha_ndbcluster_binlog.h' --- a/sql/ha_ndbcluster_binlog.h 2011-06-30 15:46:53 +0000 +++ b/sql/ha_ndbcluster_binlog.h 2012-02-16 09:48:16 +0000 @@ -1,8 +1,7 @@ #ifndef HA_NDBCLUSTER_BINLOG_INCLUDED #define HA_NDBCLUSTER_BINLOG_INCLUDED -/* Copyright (c) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc. - Use is subject to license terms. +/* Copyright (c) 2000, 2010, 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/item.cc' --- a/sql/item.cc 2012-01-26 09:38:28 +0000 +++ b/sql/item.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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/item_cmpfunc.h' --- a/sql/item_cmpfunc.h 2011-08-19 07:06:50 +0000 +++ b/sql/item_cmpfunc.h 2012-02-16 09:48:16 +0000 @@ -1,7 +1,7 @@ #ifndef ITEM_CMPFUNC_INCLUDED #define ITEM_CMPFUNC_INCLUDED -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* 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 === modified file 'sql/item_timefunc.cc' --- a/sql/item_timefunc.cc 2012-01-24 09:24:05 +0000 +++ b/sql/item_timefunc.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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/item_xmlfunc.cc' --- a/sql/item_xmlfunc.cc 2011-07-05 23:13:50 +0000 +++ b/sql/item_xmlfunc.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 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 === modified file 'sql/log_event.h' --- a/sql/log_event.h 2012-01-17 22:16:19 +0000 +++ b/sql/log_event.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/mysqld.cc' --- a/sql/mysqld.cc 2012-01-25 09:59:30 +0000 +++ b/sql/mysqld.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/mysqld.h' --- a/sql/mysqld.h 2012-01-25 09:59:30 +0000 +++ b/sql/mysqld.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 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/rpl_handler.h' --- a/sql/rpl_handler.h 2011-06-30 15:46:53 +0000 +++ b/sql/rpl_handler.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 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 === modified file 'sql/rpl_injector.cc' --- a/sql/rpl_injector.cc 2011-10-27 14:14:41 +0000 +++ b/sql/rpl_injector.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 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 === modified file 'sql/rpl_mi.cc' --- a/sql/rpl_mi.cc 2012-01-23 12:09:37 +0000 +++ b/sql/rpl_mi.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 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/rpl_mi.h' --- a/sql/rpl_mi.h 2012-01-23 12:09:37 +0000 +++ b/sql/rpl_mi.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 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/rpl_rli.cc' --- a/sql/rpl_rli.cc 2012-01-23 12:09:37 +0000 +++ b/sql/rpl_rli.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 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/rpl_rli.h' --- a/sql/rpl_rli.h 2012-01-23 12:09:37 +0000 +++ b/sql/rpl_rli.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 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/set_var.h' --- a/sql/set_var.h 2011-12-02 13:16:48 +0000 +++ b/sql/set_var.h 2012-02-16 09:48:16 +0000 @@ -1,6 +1,6 @@ #ifndef SET_VAR_INCLUDED #define SET_VAR_INCLUDED -/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 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 === modified file 'sql/slave.cc' --- a/sql/slave.cc 2012-01-23 12:09:37 +0000 +++ b/sql/slave.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sp_cache.cc' --- a/sql/sp_cache.cc 2012-01-25 09:59:30 +0000 +++ b/sql/sp_cache.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 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/sp_cache.h' --- a/sql/sp_cache.h 2012-01-25 09:59:30 +0000 +++ b/sql/sp_cache.h 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* -*- C++ -*- */ -/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 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/sql_base.cc' --- a/sql/sql_base.cc 2012-02-13 08:42:13 +0000 +++ b/sql/sql_base.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sql_cache.cc' --- a/sql/sql_cache.cc 2011-10-19 02:42:09 +0000 +++ b/sql/sql_cache.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* 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 === modified file 'sql/sql_connect.cc' --- a/sql/sql_connect.cc 2012-01-02 06:50:05 +0000 +++ b/sql/sql_connect.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2007, 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/sql_lex.cc' --- a/sql/sql_lex.cc 2012-02-09 17:58:33 +0000 +++ b/sql/sql_lex.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sql_lex.h' --- a/sql/sql_lex.h 2012-02-09 17:58:33 +0000 +++ b/sql/sql_lex.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sql_parse.cc' --- a/sql/sql_parse.cc 2012-02-08 06:40:55 +0000 +++ b/sql/sql_parse.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sql_plugin.cc' --- a/sql/sql_plugin.cc 2012-01-16 10:04:28 +0000 +++ b/sql/sql_plugin.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2005, 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/sql_prepare.cc' --- a/sql/sql_prepare.cc 2012-01-25 09:59:30 +0000 +++ b/sql/sql_prepare.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 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/sql_profile.cc' --- a/sql/sql_profile.cc 2011-07-20 06:50:47 +0000 +++ b/sql/sql_profile.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 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 === modified file 'sql/sql_repl.cc' --- a/sql/sql_repl.cc 2012-01-19 14:44:09 +0000 +++ b/sql/sql_repl.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sql_show.cc' --- a/sql/sql_show.cc 2012-02-15 13:55:31 +0000 +++ b/sql/sql_show.cc 2012-02-16 10:44:10 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sql_table.cc' --- a/sql/sql_table.cc 2012-02-09 17:58:33 +0000 +++ b/sql/sql_table.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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/sql_udf.cc' --- a/sql/sql_udf.cc 2012-01-16 10:04:28 +0000 +++ b/sql/sql_udf.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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/sys_vars.cc' --- a/sql/sys_vars.cc 2012-01-25 09:59:30 +0000 +++ b/sql/sys_vars.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 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/sys_vars.h' --- a/sql/sys_vars.h 2011-12-02 14:16:39 +0000 +++ b/sql/sys_vars.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 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 === modified file 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2012-02-03 14:11:03 +0000 +++ b/storage/archive/ha_archive.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2004, 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 === modified file 'storage/blackhole/ha_blackhole.cc' --- a/storage/blackhole/ha_blackhole.cc 2011-08-15 18:12:11 +0000 +++ b/storage/blackhole/ha_blackhole.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 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 === modified file 'storage/csv/ha_tina.cc' --- a/storage/csv/ha_tina.cc 2011-08-15 18:12:11 +0000 +++ b/storage/csv/ha_tina.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 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 === modified file 'storage/example/ha_example.cc' --- a/storage/example/ha_example.cc 2011-08-15 18:12:11 +0000 +++ b/storage/example/ha_example.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 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 === modified file 'storage/federated/ha_federated.cc' --- a/storage/federated/ha_federated.cc 2011-12-23 14:56:29 +0000 +++ b/storage/federated/ha_federated.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 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 === modified file 'storage/heap/hp_info.c' --- a/storage/heap/hp_info.c 2011-09-27 12:08:51 +0000 +++ b/storage/heap/hp_info.c 2012-02-15 16:21:38 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* 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 === modified file 'storage/myisam/ft_boolean_search.c' --- a/storage/myisam/ft_boolean_search.c 2011-09-16 12:21:05 +0000 +++ b/storage/myisam/ft_boolean_search.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2001, 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 === modified file 'storage/myisam/ft_nlq_search.c' --- a/storage/myisam/ft_nlq_search.c 2011-09-16 12:21:05 +0000 +++ b/storage/myisam/ft_nlq_search.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2001, 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 === modified file 'storage/myisam/ha_myisam.cc' --- a/storage/myisam/ha_myisam.cc 2012-02-02 12:47:14 +0000 +++ b/storage/myisam/ha_myisam.cc 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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 'storage/myisam/ha_myisam.h' --- a/storage/myisam/ha_myisam.h 2012-02-02 12:47:14 +0000 +++ b/storage/myisam/ha_myisam.h 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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 'storage/myisam/mi_check.c' --- a/storage/myisam/mi_check.c 2012-02-02 12:47:14 +0000 +++ b/storage/myisam/mi_check.c 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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 'storage/myisam/mi_packrec.c' --- a/storage/myisam/mi_packrec.c 2011-11-29 14:01:51 +0000 +++ b/storage/myisam/mi_packrec.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* 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 === modified file 'storage/myisam/mi_preload.c' --- a/storage/myisam/mi_preload.c 2011-12-14 14:33:01 +0000 +++ b/storage/myisam/mi_preload.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2003, 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 === modified file 'storage/myisam/myisamchk.c' --- a/storage/myisam/myisamchk.c 2012-02-02 12:47:14 +0000 +++ b/storage/myisam/myisamchk.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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 'storage/myisam/myisamdef.h' --- a/storage/myisam/myisamdef.h 2012-02-02 12:47:14 +0000 +++ b/storage/myisam/myisamdef.h 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 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 'storage/myisam/sort.c' --- a/storage/myisam/sort.c 2012-02-02 12:47:14 +0000 +++ b/storage/myisam/sort.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 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 'storage/perfschema/ha_perfschema.cc' --- a/storage/perfschema/ha_perfschema.cc 2011-08-15 18:12:11 +0000 +++ b/storage/perfschema/ha_perfschema.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 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 === modified file 'storage/perfschema/pfs.cc' --- a/storage/perfschema/pfs.cc 2011-07-07 11:22:43 +0000 +++ b/storage/perfschema/pfs.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2008, 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 === modified file 'storage/perfschema/table_ews_global_by_event_name.cc' --- a/storage/perfschema/table_ews_global_by_event_name.cc 2011-06-30 15:46:53 +0000 +++ b/storage/perfschema/table_ews_global_by_event_name.cc 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 'storage/perfschema/table_ews_global_by_event_name.h' --- a/storage/perfschema/table_ews_global_by_event_name.h 2011-06-30 15:46:53 +0000 +++ b/storage/perfschema/table_ews_global_by_event_name.h 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 'strings/ctype-uca.c' --- a/strings/ctype-uca.c 2011-07-22 12:54:47 +0000 +++ b/strings/ctype-uca.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public === modified file 'strings/ctype-ucs2.c' --- a/strings/ctype-ucs2.c 2012-01-23 09:23:50 +0000 +++ b/strings/ctype-ucs2.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public === modified file 'strings/ctype-utf8.c' --- a/strings/ctype-utf8.c 2012-01-23 09:23:50 +0000 +++ b/strings/ctype-utf8.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public === modified file 'strings/dtoa.c' --- a/strings/dtoa.c 2012-01-25 15:11:03 +0000 +++ b/strings/dtoa.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public === modified file 'unittest/mysys/bitmap-t.c' --- a/unittest/mysys/bitmap-t.c 2012-01-12 13:03:44 +0000 +++ b/unittest/mysys/bitmap-t.c 2012-02-16 09:48:16 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2006, 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 'unittest/mysys/my_atomic-t.c' --- a/unittest/mysys/my_atomic-t.c 2011-10-03 07:31:55 +0000 +++ b/unittest/mysys/my_atomic-t.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2006, 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 === modified file 'unittest/strings/strings-t.c' --- a/unittest/strings/strings-t.c 2011-06-30 15:46:53 +0000 +++ b/unittest/strings/strings-t.c 2012-02-16 09:48:16 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 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 No bundle (reason: useless for push emails).