diff options
author | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 18:58:19 +0530 |
---|---|---|
committer | Nirbhay Choubey <nirbhay.choubey@oracle.com> | 2012-08-07 18:58:19 +0530 |
commit | 5ad8292c63a89db63a54f9cfed6ceb3a35656f7b (patch) | |
tree | cf7e56d23409e04f0c0e3d85fc45baddbc741c4a /include | |
parent | d86d06345b7cb46bce30b34e74a1d39a8df4677b (diff) | |
download | mariadb-git-5ad8292c63a89db63a54f9cfed6ceb3a35656f7b.tar.gz |
Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST
SHOW 2012 INSTEAD OF 2011
* Added a new macro to hold the current year :
COPYRIGHT_NOTICE_CURRENT_YEAR
* Modified ORACLE_WELCOME_COPYRIGHT_NOTICE macro
to take the initial year as parameter and pick
current year from the above mentioned macro.
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 5a96da4ceb4..ef4b08d4c0d 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 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_ */ |