bzr commit into mysql-5.5-mtr branch (bjorn.munch:3151)

[Bjorn Munch]

#At file:///home/bm136801/my/mtr-55/ based on revid:bjorn.munch@stripped

 3151 Bjorn Munch	2011-01-18 [merge]
      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

No bundle (reason: revision is a merge).