diff options
| author | unknown <karen.langford@oracle.com> | 2011-02-08 12:52:33 +0100 |
|---|---|---|
| committer | Karen Langford <karen.langford@oracle.com> | 2011-02-08 12:52:33 +0100 |
| commit | 17fe23e46c32be51014da82e01bfd43a783d2c48 (patch) | |
| tree | 07f8c2be8340694279693caa7339c671b43cb30e /include | |
| parent | 994132add6118b8d91893d495a8cb628c1017da4 (diff) | |
| parent | de3c4428b8c759e85631d8d70b5845c872de5400 (diff) | |
| download | mariadb-git-17fe23e46c32be51014da82e01bfd43a783d2c48.tar.gz | |
Merge from mysql-5.1.55-release
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 3880511da2d..87cdaaad0dd 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -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 diff --git a/include/my_sys.h b/include/my_sys.h index 0ac220cec31..f6cd9dada99 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -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 |