diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 13:59:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 13:59:44 +0100 |
| commit | e772cbd7b774add42821c33b13ea052f8c9e2e6e (patch) | |
| tree | 0411c732161ad4fc4f49a02ee78abaa6632c6d4d /sql/sql_base.cc | |
| parent | 8428c116c7cc1fb6a04345637a10084810874dd8 (diff) | |
| parent | d7304375e5e0ce30979c2b92e70eb0effaa30a25 (diff) | |
| download | mariadb-git-e772cbd7b774add42821c33b13ea052f8c9e2e6e.tar.gz | |
5.1 merge
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 1e3733cb498..c1c12166543 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. +/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. 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 @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* Basic functions needed by many modules */ |