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 | 201448009668caa116de9c2ff0e224d8e8fa3de1 (patch) | |
| tree | 86efc55c73e3bb3184c0a310cdab42e5bfcdb51b | |
| parent | 1f844faa4ce9037afc04bd66c4492224a726459c (diff) | |
| parent | d3324c0098cb440343b64b9b9254531aa52f3ec9 (diff) | |
| download | mariadb-git-201448009668caa116de9c2ff0e224d8e8fa3de1.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
| -rw-r--r-- | client/mysqlbinlog.cc | 2 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 6d659b5b5c3..ecebde461f9 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -1261,7 +1261,7 @@ static void print_version() static void usage() { print_version(); - puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2001, 2010")); + puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011")); printf("\ Dumps a MySQL binary log in a format usable for viewing or for piping to\n\ the mysql command line client.\n\n"); 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_ |