summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorKent Boortz <kent.boortz@sun.com>2010-12-29 01:26:31 +0100
committerKent Boortz <kent.boortz@sun.com>2010-12-29 01:26:31 +0100
commitbe6c3fd8aa3f99074ae9d8ac729062585544b3b8 (patch)
treecf788ed2c7840aa7fb6e5003e9571e70a0c9806a /sql/sql_parse.cc
parent0a1433d7b0aa2c2d38169922817ab5010ec8e399 (diff)
parent4acfdb9df152737cc87cc205ee8d8d962c2486b7 (diff)
downloadmariadb-git-be6c3fd8aa3f99074ae9d8ac729062585544b3b8.tar.gz
Merge
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 188fd6bda53..2086100db98 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
+/* 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