summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-16 21:03:01 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-16 21:03:01 +0100
commit5d0c01608c74b09fea8c6110213160b049487a4c (patch)
tree924e11e71f586c97a20f43d66183393ea1f48504 /sql/sql_base.cc
parentcfc83cf9d3c3354d47f9e7ee903ea279f60cce58 (diff)
parente772cbd7b774add42821c33b13ea052f8c9e2e6e (diff)
downloadmariadb-git-5d0c01608c74b09fea8c6110213160b049487a4c.tar.gz
5.2 merge
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 9d3a59afa0b..b197a712eba 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 */