summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-22 18:51:33 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-22 18:51:33 +0100
commitfeba65a55495ce5cd9f5d8e6e0af8345485b52a1 (patch)
tree092f039bd213fbd1580a89f003cfd5d5690f5a86 /sql/field.cc
parentc104d31404c68b5622dc676d53308d02349755d1 (diff)
parentb81d8b2e5ab7baa9623d0af002083057cda28a97 (diff)
downloadmariadb-git-feba65a55495ce5cd9f5d8e6e0af8345485b52a1.tar.gz
merged
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc
index bdbf48751bb..42d71477372 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,5 +1,7 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates.
+/*
+ Copyright (c) 2000, 2011, Oracle and/or its affiliates.
Copyright (c) 2009-2011 Monty Program Ab
+
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
the Free Software Foundation; version 2 of the License.
@@ -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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
/**
@file