diff options
| author | Marc Alff <marc.alff@oracle.com> | 2010-07-15 17:44:45 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2010-07-15 17:44:45 -0600 |
| commit | bb9505ae310e1b7f62d3e403ba55cf2ffbcc2baa (patch) | |
| tree | 3ff84d363f521e97546933f5658dfce468f622ad /storage/perfschema/pfs_timer.cc | |
| parent | 8df20918d6751dc1eeb47ab722269dbd9d2da297 (diff) | |
| download | mariadb-git-bb9505ae310e1b7f62d3e403ba55cf2ffbcc2baa.tar.gz | |
Fixed Copyright headers in storage/perfschema
Fixed minor merge issues with #includes
Diffstat (limited to 'storage/perfschema/pfs_timer.cc')
| -rw-r--r-- | storage/perfschema/pfs_timer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/perfschema/pfs_timer.cc b/storage/perfschema/pfs_timer.cc index 65883b62c32..f30a9f8e865 100644 --- a/storage/perfschema/pfs_timer.cc +++ b/storage/perfschema/pfs_timer.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2008, 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 @@ -10,8 +10,8 @@ GNU General Public License for more details. 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 */ + along with this program; if not, write to the Free Software Foundation, + 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /** @file storage/perfschema/pfs_timer.cc |