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 | 0e007344eae972b9be7d88ca43373cb33662ac1c (patch) | |
| tree | 7b3561cb3ea2ad24d013e847680ec165f406387e /sql/tztime.h | |
| parent | 3794110f0215f0631107c2694dc0f1675a4bb520 (diff) | |
| parent | 681476255147dacac7e3674b6cd2ae770fee2208 (diff) | |
| download | mariadb-git-0e007344eae972b9be7d88ca43373cb33662ac1c.tar.gz | |
mysql-5.5.18 merge
Diffstat (limited to 'sql/tztime.h')
| -rw-r--r-- | sql/tztime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/tztime.h b/sql/tztime.h index c7ee0ff36cc..eb7d85c48b2 100644 --- a/sql/tztime.h +++ b/sql/tztime.h @@ -1,7 +1,7 @@ #ifndef TZTIME_INCLUDED #define TZTIME_INCLUDED -/* Copyright (C) 2004 MySQL AB +/* Copyright (c) 2004, 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 @@ -14,7 +14,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 */ #ifdef USE_PRAGMA_INTERFACE |