diff options
| author | Luis Soares <luis.soares@oracle.com> | 2011-07-11 17:19:56 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@oracle.com> | 2011-07-11 17:19:56 +0100 |
| commit | 25df755040116e3bc95c3d21cbabf0bbe309aa00 (patch) | |
| tree | 86efc55c73e3bb3184c0a310cdab42e5bfcdb51b /include | |
| parent | 438d21189c2dd9494723aefd26c0f491fefb3e6a (diff) | |
| parent | e018925a64dc40f22bd6f370ccc732f75185a4d9 (diff) | |
| download | mariadb-git-25df755040116e3bc95c3d21cbabf0bbe309aa00.tar.gz | |
BUG#12695969
Manually merged from mysql-5.1:
- fixed mysqlbinlog copyright year: 2001 --> 2000
- fixed address in license header
conflicts
=========
- client/mysqlbinlog.cc
- include/welcome_copyright_notice.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/welcome_copyright_notice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index c3ffad1527d..5a96da4ceb4 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 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 */ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ |