diff options
| author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 19:07:13 +0530 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 19:07:13 +0530 |
| commit | fb697972b3481e335bb446448dff3076fdcc4cc3 (patch) | |
| tree | 0f759f6310d21c1917beeb39e70765d26fb2e098 /include | |
| parent | 7b343df2891c9c351d1491628ce4df51ded97191 (diff) | |
| parent | d4e4538b2de4894f35c556bcaf9baf0a010969a9 (diff) | |
| download | mariadb-git-fb697972b3481e335bb446448dff3076fdcc4cc3.tar.gz | |
Merge of patch for Bug#13928675 from mysql-5.1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/welcome_copyright_notice.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index feb72282c40..ef4b08d4c0d 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2011, 2012, 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 @@ -16,16 +16,21 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012" + /* This define specifies copyright notice which is displayed by every MySQL program on start, or on help screen. */ - -#define ORACLE_WELCOME_COPYRIGHT_NOTICE(years) \ - "Copyright (c) " years ", Oracle and/or its affiliates. All rights reserved.\n" \ - "\n" \ - "Oracle is a registered trademark of Oracle Corporation and/or its\n" \ - "affiliates. Other names may be trademarks of their respective\n" \ - "owners.\n" +#define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \ + (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \ + "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \ + "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \ + "registered trademark of Oracle Corporation and/or its\naffiliates. " \ + "Other names may be trademarks of their respective\nowners.\n" : \ + "Copyright (c) " first_year ", Oracle and/or its affiliates. " \ + "All rights reserved.\n\nOracle is a registered trademark of " \ + "Oracle Corporation and/or its\naffiliates. Other names may be " \ + "trademarks of their respective\nowners.\n") #endif /* _welcome_copyright_notice_h_ */ |