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 | 920d185fd8551b9737161ee903b2d0bc24dda2f8 (patch) | |
| tree | f61328771628e2b6b67f40d38e0a493c5ba4e6f7 /include | |
| parent | b69b46c77561fd773943738c348c32b8bda5e51e (diff) | |
| parent | fddb1f1b1342026bbe39e5ae880c775fc5f189c1 (diff) | |
| download | mariadb-git-920d185fd8551b9737161ee903b2d0bc24dda2f8.tar.gz | |
Merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 4 | ||||
| -rw-r--r-- | include/my_handler.h | 4 | ||||
| -rw-r--r-- | include/my_sys.h | 2 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 08532db1731..a3dbc386857 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,11 +1,11 @@ # Copyright (C) 2000-2006 MySQL AB # -# This library is free software; you can redistribute it and/or +# This program is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public # License as published by the Free Software Foundation; version 2 # of the License. # -# This library is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Library General Public License for more details. diff --git a/include/my_handler.h b/include/my_handler.h index a3376cb74a2..7dfdb345a89 100644 --- a/include/my_handler.h +++ b/include/my_handler.h @@ -1,11 +1,11 @@ /* Copyright (C) 2002-2006 MySQL AB - This library is free software; you can redistribute it and/or + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; version 2 of the License. - This library is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. diff --git a/include/my_sys.h b/include/my_sys.h index 3a240cfc118..90fd78f77ba 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000, 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 diff --git a/include/mysql_com.h b/include/mysql_com.h index 7d3dd3d4f34..357519d549a 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 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 |