summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-12-29 14:30:37 +0300
committerAlexander Nozdrin <alexander.nozdrin@oracle.com>2010-12-29 14:30:37 +0300
commita448580d650280ad495f55d358b9b0437f2ceecd (patch)
tree3ea10abc587dbe136b69be37d3644d73dd17cbf4 /sql/item_func.h
parent9da97a6745a0de58654a9efe1e298044a68fcbe1 (diff)
parent85323eda8a5823e4db1fa34dc998684b67e710b5 (diff)
downloadmariadb-git-a448580d650280ad495f55d358b9b0437f2ceecd.tar.gz
Auto-merge from mysql-5.0-bugteam.
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 47a13559e90..96af2602821 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2010, 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