summaryrefslogtreecommitdiff
path: root/sql/item.cc
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
commitf97ef7a40e45183a68471ab2267c451c3ecb4b1b (patch)
treede567af17defc412ed072797f882a3db0932209e /sql/item.cc
parent335e842d24083e8961b7f6b7e9563628dcb8956d (diff)
parent6f25dee2ac6ac199d48fe1d8ec5959b77f5e5dcd (diff)
downloadmariadb-git-f97ef7a40e45183a68471ab2267c451c3ecb4b1b.tar.gz
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index b8fcdb832d4..d3f933dc13f 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -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