summaryrefslogtreecommitdiff
path: root/include/myisammrg.h
diff options
context:
space:
mode:
authorKent Boortz <kent.boortz@oracle.com>2011-06-30 17:37:13 +0200
committerKent Boortz <kent.boortz@oracle.com>2011-06-30 17:37:13 +0200
commit1400d7a2cc33fd158efcb3bd638c4ee4c8762207 (patch)
tree340d25d29aee511a9aaaf908894aea6a4ccbe8d0 /include/myisammrg.h
parentf027f94b51e8103635fef5111c03d4f971e09488 (diff)
parente5ce023f5716212aa1d20c757ebc8c6cecdf055a (diff)
downloadmariadb-git-1400d7a2cc33fd158efcb3bd638c4ee4c8762207.tar.gz
Updated/added copyright headers
Diffstat (limited to 'include/myisammrg.h')
-rw-r--r--include/myisammrg.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/myisammrg.h b/include/myisammrg.h
index 31ce3fa47b8..15a8b8aae76 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -1,4 +1,6 @@
-/* Copyright (C) 2000 MySQL AB
+/*
+ Copyright (c) 2000-2002, 2004, 2006-2008 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 +13,8 @@
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
+*/
/* This file should be included when using merge_isam_funktions */