diff options
author | unknown <timour@askmonty.org> | 2012-11-08 15:24:35 +0200 |
---|---|---|
committer | unknown <timour@askmonty.org> | 2012-11-08 15:24:35 +0200 |
commit | c5cef4b1664faf134611f1d94ace7efc0bb93ebd (patch) | |
tree | 291e9a80b2b240953ae531bb645eaa10a9bf1aa3 /include | |
parent | a00688a7154ac87dff82f15810ebec9ec577e0f0 (diff) | |
parent | 7c23d6d0c66cb3b84cb466f956e19bfea0acc342 (diff) | |
download | mariadb-git-c5cef4b1664faf134611f1d94ace7efc0bb93ebd.tar.gz |
Merge MariaDB 5.1.66 -> 5.2.12
Diffstat (limited to 'include')
-rw-r--r-- | include/welcome_copyright_notice.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 6898cc8630c..8a9db3ad3dd 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. +/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. 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,12 +16,14 @@ #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, Monty Program Ab and others.\n" +#define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \ + "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR \ + ", Oracle, Monty Program Ab and others.\n" #endif /* _welcome_copyright_notice_h_ */ |