summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-01-05 18:10:20 +0200
committerGeorgi Kodinov <joro@sun.com>2009-01-05 18:10:20 +0200
commit8c25823f94ce4f849cde5b90babc69e7c04695a0 (patch)
treede567af17defc412ed072797f882a3db0932209e /sql/field.h
parent33cbf93cedf153f502f8bd2980c71d2cc0025eda (diff)
parentf5ec81002726a08401b7bbac7e6d485dc6b59126 (diff)
downloadmariadb-git-8c25823f94ce4f849cde5b90babc69e7c04695a0.tar.gz
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h
index 23033e6cc7a..5136f760fc1 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
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