diff options
author | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 00:47:05 +0100 |
---|---|---|
committer | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 00:47:05 +0100 |
commit | 4acfdb9df152737cc87cc205ee8d8d962c2486b7 (patch) | |
tree | f61328771628e2b6b67f40d38e0a493c5ba4e6f7 /mysql-test/lib | |
parent | bc56dcea9d7047c5561cee08ec2d74077e329f7d (diff) | |
parent | 85323eda8a5823e4db1fa34dc998684b67e710b5 (diff) | |
download | mariadb-git-4acfdb9df152737cc87cc205ee8d8d962c2486b7.tar.gz |
Merge
Diffstat (limited to 'mysql-test/lib')
-rw-r--r-- | mysql-test/lib/mtr_cases.pm | 4 | ||||
-rw-r--r-- | mysql-test/lib/mtr_process.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 0c31d25b81b..708b8e90fc4 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -1,6 +1,6 @@ # -*- cperl -*- -# Copyright (C) 2005-2006 MySQL AB -# +# Copyright (c) 2005, 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 # the Free Software Foundation; version 2 of the License. diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index a42627c93cd..3c8a938ae54 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -1,5 +1,5 @@ # -*- cperl -*- -# Copyright (C) 2004-2006 MySQL AB +# Copyright (c) 2004, 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 |