diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 11:42:07 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2011-08-09 11:42:07 +0400 |
| commit | c7087cd53c853d4da7f27175862c0946cb78d14b (patch) | |
| tree | 183294dd1b6ee36bf961c7155e9112b20933fc54 /include | |
| parent | cdb8bb981c09225d3c8de154ba7b19e47e0e85c3 (diff) | |
| parent | 6f8a80270c4f1004bfbe9bdb9e5fbce8f0e03981 (diff) | |
| download | mariadb-git-c7087cd53c853d4da7f27175862c0946cb78d14b.tar.gz | |
Manual merge from mysql-5.1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/welcome_copyright_notice.h | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 0cb8557aeb5..bd5d2a42b6d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -38,7 +38,7 @@ noinst_HEADERS = config-win.h config-netware.h my_bit.h \ my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ my_compare.h my_time.h my_vle.h my_user.h \ - my_libwrap.h my_stacktrace.h + my_libwrap.h my_stacktrace.h welcome_copyright_notice.h EXTRA_DIST = mysql.h.pp mysql/plugin.h.pp diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h new file mode 100644 index 00000000000..5a96da4ceb4 --- /dev/null +++ b/include/welcome_copyright_notice.h @@ -0,0 +1,31 @@ +/* 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 + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#ifndef _welcome_copyright_notice_h_ +#define _welcome_copyright_notice_h_ + +/* + 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" + +#endif /* _welcome_copyright_notice_h_ */ |