diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 09:58:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 09:58:39 +0100 |
| commit | 08ba257846e75641304e530b7a4a4ab21b1714d7 (patch) | |
| tree | 5152c8e758f3b566dda4bf07bf5aad1607910eda /include | |
| parent | 65831bca6f516db383c1bc04884b65b9fa7b6926 (diff) | |
| parent | 40bbd1862376fa634e42b4e0197e22f5633f0c21 (diff) | |
| download | mariadb-git-08ba257846e75641304e530b7a4a4ab21b1714d7.tar.gz | |
mysql-5.1 merge
mysys/errors.c:
revert upstream's fix. use a much simpler one
mysys/my_write.c:
revert upstream's fix. use a simpler one
sql/item_xmlfunc.cc:
useless, but ok
sql/mysqld.cc:
simplify upstream's fix
storage/heap/hp_delete.c:
remove upstream's fix.
we'll use a much less expensive approach.
Diffstat (limited to 'include')
| -rw-r--r-- | include/welcome_copyright_notice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h index 8a9db3ad3dd..c141c62f403 100644 --- a/include/welcome_copyright_notice.h +++ b/include/welcome_copyright_notice.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011, 2012, Oracle and/or its affiliates. +/* Copyright (c) 2011, 2013, 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,7 +16,7 @@ #ifndef _welcome_copyright_notice_h_ #define _welcome_copyright_notice_h_ -#define COPYRIGHT_NOTICE_CURRENT_YEAR "2012" +#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013" /* This define specifies copyright notice which is displayed by every MySQL |