summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-07 15:28:36 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-07 15:28:36 +0200
commitb831c6dbbb29a9dc7dd3e3b7910f5b39e96fe2af (patch)
treed885b266e360e44a66cfa97fb5d2166a498eeb78 /sql/field.cc
parent1e3a4dc1056ed243fd80dc968ae0e8fa08fbb88c (diff)
parenta448580d650280ad495f55d358b9b0437f2ceecd (diff)
downloadmariadb-git-b831c6dbbb29a9dc7dd3e3b7910f5b39e96fe2af.tar.gz
automerge
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 3efd6111dcb..5cbbf98eedd 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 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