diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:51:33 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-22 18:51:33 +0100 |
commit | feba65a55495ce5cd9f5d8e6e0af8345485b52a1 (patch) | |
tree | 092f039bd213fbd1580a89f003cfd5d5690f5a86 /sql/tztime.h | |
parent | c104d31404c68b5622dc676d53308d02349755d1 (diff) | |
parent | b81d8b2e5ab7baa9623d0af002083057cda28a97 (diff) | |
download | mariadb-git-feba65a55495ce5cd9f5d8e6e0af8345485b52a1.tar.gz |
merged
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 |