From: Bjorn Munch Date: January 18 2011 11:01am Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2971) List-Archive: http://lists.mysql.com/commits/129063 Message-Id: <201101181101.p0IB1kJe019146@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0899395863==" --===============0899395863== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/bm136801/my/mtr-51/ based on revid:bjorn.munch@stripped 2971 Bjorn Munch 2011-01-18 Some more copyright fixes in mtr modified: mysql-test/lib/mtr_gcov.pl mysql-test/lib/mtr_io.pl mysql-test/lib/mtr_match.pm mysql-test/lib/mtr_stress.pl mysql-test/lib/mtr_unique.pm === modified file 'mysql-test/lib/mtr_gcov.pl' --- a/mysql-test/lib/mtr_gcov.pl 2009-02-27 11:20:53 +0000 +++ b/mysql-test/lib/mtr_gcov.pl 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004, 2006 MySQL AB +# Copyright (C) 2004, 2006 MySQL AB, 2009 Sun Microsystems, Inc. # # 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_io.pl' --- a/mysql-test/lib/mtr_io.pl 2008-11-14 20:35:32 +0000 +++ b/mysql-test/lib/mtr_io.pl 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2004-2007 MySQL AB, 2008 Sun Microsystems, Inc. # # 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_match.pm' --- a/mysql-test/lib/mtr_match.pm 2008-04-08 14:51:26 +0000 +++ b/mysql-test/lib/mtr_match.pm 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (C) 2004-2008 MySQL AB # # 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_stress.pl' --- a/mysql-test/lib/mtr_stress.pl 2009-11-19 12:19:11 +0000 +++ b/mysql-test/lib/mtr_stress.pl 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2004-2007 MySQL AB, 2009 Sun Microsystems, Inc. # # 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_unique.pm' --- a/mysql-test/lib/mtr_unique.pm 2009-04-23 11:35:02 +0000 +++ b/mysql-test/lib/mtr_unique.pm 2011-01-18 11:01:40 +0000 @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2006 MySQL AB +# Copyright (C) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc. # # 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 --===============0899395863== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/bjorn.munch@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@stripped # target_branch: file:///home/bm136801/my/mtr-51/ # testament_sha1: b6326d0b1072a0b33a6224d9a39a85f332e9a27a # timestamp: 2011-01-18 12:01:46 +0100 # base_revision_id: bjorn.munch@stripped\ # 599zpiomdej6jwtl # # Begin bundle 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 XuKI/xdyRThQkO91jAo= --===============0899395863==--