summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-16 21:03:01 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-16 21:03:01 +0100
commit5d0c01608c74b09fea8c6110213160b049487a4c (patch)
tree924e11e71f586c97a20f43d66183393ea1f48504 /sql/field.cc
parentcfc83cf9d3c3354d47f9e7ee903ea279f60cce58 (diff)
parente772cbd7b774add42821c33b13ea052f8c9e2e6e (diff)
downloadmariadb-git-5d0c01608c74b09fea8c6110213160b049487a4c.tar.gz
5.2 merge
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 933025ba896..17398714d5b 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1,6 +1,6 @@
/*
- Copyright (c) 2000, 2011, Oracle and/or its affiliates.
- Copyright (c) 2008-2011 Monty Program Ab
+ Copyright (c) 2000, 2012, Oracle and/or its affiliates.
+ Copyright (c) 2008, 2014, 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