diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-03 19:17:05 +0100 |
commit | d61d6146438377f393a80b674a4cb6dd639b6a75 (patch) | |
tree | 7b3561cb3ea2ad24d013e847680ec165f406387e /sql/sql_cache.cc | |
parent | 435c9b7d7cdd15102f0f5eddf51e37b3b3b09a27 (diff) | |
parent | 3604b340e57ab54ccfab5187560e1d7f7eda0453 (diff) | |
download | mariadb-git-d61d6146438377f393a80b674a4cb6dd639b6a75.tar.gz |
mysql-5.5.18 merge
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 9e2279d71ea..db0da4bdae6 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.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 @@ -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 St, Fifth Floor, Boston, MA 02110-1301 USA */ /* Description of the query cache: |