summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2011-01-28 13:28:15 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2011-01-28 13:28:15 +0100
commitbede87d3537310ecf8ec75d58cd83e625937bc68 (patch)
treeba1b1966351d93df1a70ff03561df08aa06bb056 /sql/item_timefunc.h
parentcbf2f80d04773bea146aad4fdeb29c783e571dfb (diff)
parent62ab20034300b0483c8d73387794d881f12b809d (diff)
downloadmariadb-git-bede87d3537310ecf8ec75d58cd83e625937bc68.tar.gz
merge
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 622d6a76e50..a09d72ca4b3 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -1,7 +1,7 @@
#ifndef ITEM_TIMEFUNC_INCLUDED
#define ITEM_TIMEFUNC_INCLUDED
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2011 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