diff options
author | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 01:26:31 +0100 |
---|---|---|
committer | Kent Boortz <kent.boortz@sun.com> | 2010-12-29 01:26:31 +0100 |
commit | be6c3fd8aa3f99074ae9d8ac729062585544b3b8 (patch) | |
tree | cf788ed2c7840aa7fb6e5003e9571e70a0c9806a /include | |
parent | 0a1433d7b0aa2c2d38169922817ab5010ec8e399 (diff) | |
parent | 4acfdb9df152737cc87cc205ee8d8d962c2486b7 (diff) | |
download | mariadb-git-be6c3fd8aa3f99074ae9d8ac729062585544b3b8.tar.gz |
Merge
Diffstat (limited to 'include')
-rw-r--r-- | include/my_handler.h | 4 | ||||
-rw-r--r-- | include/my_sys.h | 2 | ||||
-rw-r--r-- | include/mysql_com.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/my_handler.h b/include/my_handler.h index 977c0042938..ba0d3fc313f 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 50abfb124f5..6e2cbd4c0b3 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc +/* 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 bc9296a6d02..f4c023721de 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 |