From: Kent Boortz Date: February 16 2012 11:17am Subject: bzr push into mysql-5.1 branch (kent.boortz:3689) List-Archive: http://lists.mysql.com/commits/142904 Message-Id: <20120216111758.87BC4F018F@tyr80.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3689 Kent Boortz 2012-02-16 [merge] Merge modified: storage/innobase/row/row0ins.c storage/innobase/row/row0upd.c storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/include/log0log.h storage/innodb_plugin/include/mtr0mtr.h storage/innodb_plugin/log/log0log.c storage/innodb_plugin/mtr/mtr0mtr.c storage/innodb_plugin/row/row0ins.c storage/innodb_plugin/row/row0upd.c === modified file 'client/mysqldump.c' --- a/client/mysqldump.c 2012-01-17 03:40:58 +0000 +++ b/client/mysqldump.c 2012-02-15 16:21:38 +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:50:54 +0000 +++ b/client/sql_string.cc 2012-02-15 16:21:38 +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 'include/decimal.h' --- a/include/decimal.h 2011-08-29 09:24:36 +0000 +++ b/include/decimal.h 2012-02-15 16:21:38 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 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 'include/m_ctype.h' --- a/include/m_ctype.h 2012-01-23 09:07:10 +0000 +++ b/include/m_ctype.h 2012-02-15 16:21:38 +0000 @@ -1,5 +1,5 @@ /* - 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 'libmysqld/CMakeLists.txt' --- a/libmysqld/CMakeLists.txt 2011-11-30 14:39:29 +0000 +++ b/libmysqld/CMakeLists.txt 2012-02-15 16:21:38 +0000 @@ -1,5 +1,4 @@ -# Copyright (c) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc. -# Use is subject to license terms. +# 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/include/mtr_check.sql' --- a/mysql-test/include/mtr_check.sql 2011-09-27 10:56:05 +0000 +++ b/mysql-test/include/mtr_check.sql 2012-02-15 16:21:38 +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/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2011-10-03 11:41:59 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2012-02-15 16:21:38 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# 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 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2012-01-31 12:09:40 +0000 +++ b/mysql-test/mysql-test-run.pl 2012-02-15 16:21:38 +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 Library General Public === modified file 'mysys/charset-def.c' --- a/mysys/charset-def.c 2012-01-23 09:07:10 +0000 +++ b/mysys/charset-def.c 2012-02-15 16:21:38 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* 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 08:06:59 +0000 +++ b/mysys/my_symlink.c 2012-02-15 16:21:38 +0000 @@ -1,5 +1,5 @@ /* - 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 '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:55:28 +0000 +++ b/scripts/mysql_install_db.sh 2012-02-15 16:21:38 +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:00:13 +0000 +++ b/sql-common/my_time.c 2012-02-15 16:21:38 +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 as published by === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2011-11-30 14:39:29 +0000 +++ b/sql/CMakeLists.txt 2012-02-15 16:21:38 +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/Makefile.am' --- a/sql/Makefile.am 2011-11-30 14:39:29 +0000 +++ b/sql/Makefile.am 2012-02-15 16:21:38 +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/field_conv.cc' --- a/sql/field_conv.cc 2011-11-18 13:47:11 +0000 +++ b/sql/field_conv.cc 2012-02-15 16:21:38 +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 'sql/filesort.cc' --- a/sql/filesort.cc 2011-08-30 07:56:07 +0000 +++ b/sql/filesort.cc 2012-02-15 16:21:38 +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 'sql/item.cc' --- a/sql/item.cc 2012-01-26 09:25:23 +0000 +++ b/sql/item.cc 2012-02-15 16:21:38 +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_subselect.cc' --- a/sql/item_subselect.cc 2011-10-05 09:28:20 +0000 +++ b/sql/item_subselect.cc 2012-02-15 16:21:38 +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 'sql/item_subselect.h' --- a/sql/item_subselect.h 2011-10-05 09:28:20 +0000 +++ b/sql/item_subselect.h 2012-02-15 16:21:38 +0000 @@ -1,5 +1,5 @@ /* - 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/item_timefunc.cc' --- a/sql/item_timefunc.cc 2012-01-24 09:00:13 +0000 +++ b/sql/item_timefunc.cc 2012-02-15 16:21:38 +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/my_decimal.h' --- a/sql/my_decimal.h 2011-10-14 08:44:27 +0000 +++ b/sql/my_decimal.h 2012-02-15 16:21:38 +0000 @@ -1,5 +1,5 @@ /* - 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/protocol.cc' --- a/sql/protocol.cc 2011-07-15 12:25:00 +0000 +++ b/sql/protocol.cc 2012-02-15 16:21:38 +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/rpl_rli.h' --- a/sql/rpl_rli.h 2011-08-26 09:57:29 +0000 +++ b/sql/rpl_rli.h 2012-02-15 16:21:38 +0000 @@ -1,5 +1,5 @@ /* - 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/sql_cache.cc' --- a/sql/sql_cache.cc 2011-10-19 02:21:31 +0000 +++ b/sql/sql_cache.cc 2012-02-15 16:21:38 +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 'sql/sql_connect.cc' --- a/sql/sql_connect.cc 2012-01-02 06:25:48 +0000 +++ b/sql/sql_connect.cc 2012-02-15 16:21:38 +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_show.cc' --- a/sql/sql_show.cc 2012-02-15 13:53:29 +0000 +++ b/sql/sql_show.cc 2012-02-16 10:35:30 +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/unireg.h' --- a/sql/unireg.h 2011-07-15 12:08:14 +0000 +++ b/sql/unireg.h 2012-02-15 16:21:38 +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 'storage/archive/ha_archive.cc' --- a/storage/archive/ha_archive.cc 2012-02-03 14:07:00 +0000 +++ b/storage/archive/ha_archive.cc 2012-02-15 16:21:38 +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/federated/Makefile.am' --- a/storage/federated/Makefile.am 2011-09-05 12:38:20 +0000 +++ b/storage/federated/Makefile.am 2012-02-15 16:21:38 +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 'storage/federated/ha_federated.cc' --- a/storage/federated/ha_federated.cc 2011-12-23 14:52:44 +0000 +++ b/storage/federated/ha_federated.cc 2012-02-15 16:21:38 +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_create.c' --- a/storage/heap/hp_create.c 2011-09-27 12:08:51 +0000 +++ b/storage/heap/hp_create.c 2012-02-15 16:21:38 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 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/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 11:30:31 +0000 +++ b/storage/myisam/ft_boolean_search.c 2012-02-15 16:21:38 +0000 @@ -1,6 +1,5 @@ /* - Copyright (c) 2001-2007 MySQL AB, 2008-2010 Sun Microsystems, Inc. - Use is subject to license terms. + 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 11:30:31 +0000 +++ b/storage/myisam/ft_nlq_search.c 2012-02-15 16:21:38 +0000 @@ -1,5 +1,5 @@ /* - 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/mi_check.c' --- a/storage/myisam/mi_check.c 2012-02-02 08:49:38 +0000 +++ b/storage/myisam/mi_check.c 2012-02-15 16:21:38 +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_close.c' --- a/storage/myisam/mi_close.c 2011-11-29 12:29:35 +0000 +++ b/storage/myisam/mi_close.c 2012-02-15 16:21:38 +0000 @@ -1,6 +1,5 @@ /* - Copyright (c) 2000-2007 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 === modified file 'storage/myisam/mi_delete_all.c' --- a/storage/myisam/mi_delete_all.c 2011-10-20 11:03:22 +0000 +++ b/storage/myisam/mi_delete_all.c 2012-02-15 16:21:38 +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 'storage/myisam/mi_packrec.c' --- a/storage/myisam/mi_packrec.c 2011-11-29 12:29:35 +0000 +++ b/storage/myisam/mi_packrec.c 2012-02-15 16:21:38 +0000 @@ -1,6 +1,5 @@ /* - 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 === modified file 'storage/myisam/mi_preload.c' --- a/storage/myisam/mi_preload.c 2011-12-14 13:41:40 +0000 +++ b/storage/myisam/mi_preload.c 2012-02-15 16:21:38 +0000 @@ -1,6 +1,5 @@ /* - Copyright (c) 2003, 2005-2007 MySQL AB, 2009 Sun Microsystems, Inc. - Use is subject to license terms. + 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 'strings/ctype-ucs2.c' --- a/strings/ctype-ucs2.c 2012-01-23 09:07:10 +0000 +++ b/strings/ctype-ucs2.c 2012-02-15 16:21:38 +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:07:10 +0000 +++ b/strings/ctype-utf8.c 2012-02-15 16:21:38 +0000 @@ -1,5 +1,4 @@ -/* Copyright (c) 2002-2008 MySQL AB, 2009 Sun Microsystems, Inc. - Use is subject to license terms. +/* Copyright (c) 2002, 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/decimal.c' --- a/strings/decimal.c 2011-10-14 08:44:27 +0000 +++ b/strings/decimal.c 2012-02-15 16:21:38 +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 'unittest/mysys/bitmap-t.c' --- a/unittest/mysys/bitmap-t.c 2012-01-11 17:40:29 +0000 +++ b/unittest/mysys/bitmap-t.c 2012-02-15 16:21:38 +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 No bundle (reason: useless for push emails).