summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorKent Boortz <kent.boortz@oracle.com>2011-06-30 17:31:31 +0200
committerKent Boortz <kent.boortz@oracle.com>2011-06-30 17:31:31 +0200
commite5ce023f5716212aa1d20c757ebc8c6cecdf055a (patch)
tree263be5af7571db4d71e744c514bc690fcb74ecf3 /libmysqld
parente2b44930cc499501cbfde81062ea95902eb04465 (diff)
downloadmariadb-git-e5ce023f5716212aa1d20c757ebc8c6cecdf055a.tar.gz
Updated/added copyright headers
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am7
-rw-r--r--libmysqld/libmysqld.c5
2 files changed, 7 insertions, 5 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index fd2609d026e..5a14a4b02b1 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2001-2006 MySQL AB
+# Copyright (c) 2001-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+# Use is subject to license terms.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
@@ -12,8 +13,8 @@
#
# You should have received a copy of the GNU Library General Public
# License along with this library; if not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-# MA 02111-1307, USA
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA
#
# This file is public domain and comes with NO WARRANTY of any kind
diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c
index 969ea442622..3fcc1b1af0d 100644
--- a/libmysqld/libmysqld.c
+++ b/libmysqld/libmysqld.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2001-2007 MySQL AB, 2009 Sun Microsystems, Inc.
+ Use is subject to license terms.
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
@@ -11,7 +12,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <my_global.h>
#include <mysql.h>