summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-07 15:30:42 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-07 15:30:42 +0200
commit1ec2fccd6ddab49051cce92fdb1fc268cd41d3c6 (patch)
tree6ac405c960b55307209d659c4786e2e5f41de576 /sql/sql_base.cc
parent95cc85dbf515991ea1b19307cacce5c4ba24f21d (diff)
parentd2b0c83646292a85f4600ef6316167cd7571d471 (diff)
downloadmariadb-git-1ec2fccd6ddab49051cce92fdb1fc268cd41d3c6.tar.gz
automerge
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 7b701724531..67815d7d9b4 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1,4 +1,4 @@
-/* Copyright 2000-2008 MySQL AB, 2008 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