diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 13:59:44 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 13:59:44 +0100 |
commit | e772cbd7b774add42821c33b13ea052f8c9e2e6e (patch) | |
tree | 0411c732161ad4fc4f49a02ee78abaa6632c6d4d /sql/field.cc | |
parent | 8428c116c7cc1fb6a04345637a10084810874dd8 (diff) | |
parent | d7304375e5e0ce30979c2b92e70eb0effaa30a25 (diff) | |
download | mariadb-git-e772cbd7b774add42821c33b13ea052f8c9e2e6e.tar.gz |
5.1 merge
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index bdbf6471d0e..fb718aac5bf 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 |