summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 21:29:06 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 21:29:06 +0300
commit5543b75550962f07b4adcd47a6e52accec0a7d0f (patch)
tree3db2f169f90a0a6ea1569edb0523732355515eda /include
parent15f1e03d46dfa704beeed4880ed72c0163869dc3 (diff)
downloadmariadb-git-5543b75550962f07b4adcd47a6e52accec0a7d0f.tar.gz
Update FSF Address
* Update wrong zip-code
Diffstat (limited to 'include')
-rw-r--r--include/CMakeLists.txt2
-rw-r--r--include/atomic/gcc_builtins.h2
-rw-r--r--include/atomic/generic-msvc.h2
-rw-r--r--include/atomic/nolock.h2
-rw-r--r--include/atomic/rwlock.h2
-rw-r--r--include/atomic/solaris.h2
-rw-r--r--include/atomic/x86-gcc.h2
-rw-r--r--include/base64.h2
-rw-r--r--include/decimal.h2
-rw-r--r--include/errmsg.h2
-rw-r--r--include/ft_global.h2
-rw-r--r--include/hash.h2
-rw-r--r--include/heap.h2
-rw-r--r--include/keycache.h2
-rw-r--r--include/lf.h2
-rw-r--r--include/m_ctype.h2
-rw-r--r--include/m_string.h2
-rw-r--r--include/my_aes.h2
-rw-r--r--include/my_alarm.h2
-rw-r--r--include/my_alloc.h2
-rw-r--r--include/my_atomic.h2
-rw-r--r--include/my_attribute.h2
-rw-r--r--include/my_bit.h2
-rw-r--r--include/my_bitmap.h2
-rw-r--r--include/my_check_opt.h2
-rw-r--r--include/my_compare.h2
-rw-r--r--include/my_compiler.h2
-rw-r--r--include/my_dbug.h2
-rw-r--r--include/my_dir.h2
-rw-r--r--include/my_getopt.h2
-rw-r--r--include/my_global.h2
-rw-r--r--include/my_libwrap.h2
-rw-r--r--include/my_list.h2
-rw-r--r--include/my_md5.h2
-rw-r--r--include/my_net.h2
-rw-r--r--include/my_nosys.h2
-rw-r--r--include/my_pthread.h2
-rw-r--r--include/my_rdtsc.h2
-rw-r--r--include/my_stacktrace.h2
-rw-r--r--include/my_sys.h2
-rw-r--r--include/my_time.h2
-rw-r--r--include/my_tree.h2
-rw-r--r--include/my_uctype.h2
-rw-r--r--include/my_user.h2
-rw-r--r--include/my_xml.h2
-rw-r--r--include/myisam.h2
-rw-r--r--include/myisammrg.h2
-rw-r--r--include/myisampack.h2
-rw-r--r--include/mysql.h2
-rw-r--r--include/mysql/client_plugin.h2
-rw-r--r--include/mysql/plugin.h2
-rw-r--r--include/mysql/plugin_audit.h2
-rw-r--r--include/mysql/plugin_auth.h2
-rw-r--r--include/mysql/plugin_auth_common.h2
-rw-r--r--include/mysql/plugin_ftparser.h2
-rw-r--r--include/mysql/service_debug_sync.h2
-rw-r--r--include/mysql/service_kill_statement.h2
-rw-r--r--include/mysql/service_my_snprintf.h2
-rw-r--r--include/mysql/service_thd_alloc.h2
-rw-r--r--include/mysql/service_thd_wait.h2
-rw-r--r--include/mysql/service_thread_scheduler.h2
-rw-r--r--include/mysql/services.h2
-rw-r--r--include/mysql_com.h2
-rw-r--r--include/mysql_embed.h2
-rw-r--r--include/mysql_time.h2
-rw-r--r--include/mysys_err.h2
-rw-r--r--include/password.h2
-rw-r--r--include/probes_mysql.d.base2
-rw-r--r--include/probes_mysql.h2
-rw-r--r--include/rijndael.h2
-rw-r--r--include/service_versions.h2
-rw-r--r--include/sha1.h2
-rw-r--r--include/sha2.h2
-rw-r--r--include/sql_common.h2
-rw-r--r--include/sslopt-case.h2
-rw-r--r--include/sslopt-longopts.h2
-rw-r--r--include/sslopt-vars.h2
-rw-r--r--include/t_ctype.h2
-rw-r--r--include/thr_alarm.h2
-rw-r--r--include/thr_lock.h2
-rw-r--r--include/thread_pool_priv.h2
-rw-r--r--include/typelib.h2
-rw-r--r--include/welcome_copyright_notice.h2
83 files changed, 83 insertions, 83 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 219a2917917..21209bb239c 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -11,7 +11,7 @@
#
# 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
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
SET(HEADERS_GEN_CONFIGURE
mysql_version.h
diff --git a/include/atomic/gcc_builtins.h b/include/atomic/gcc_builtins.h
index fb6a537d204..49b7125fbef 100644
--- a/include/atomic/gcc_builtins.h
+++ b/include/atomic/gcc_builtins.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#define make_atomic_add_body(S) \
v= __sync_fetch_and_add(a, v);
diff --git a/include/atomic/generic-msvc.h b/include/atomic/generic-msvc.h
index 6c5272c98f4..754f0bfa8b4 100644
--- a/include/atomic/generic-msvc.h
+++ b/include/atomic/generic-msvc.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _atomic_h_cleanup_
#define _atomic_h_cleanup_ "atomic/generic-msvc.h"
diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h
index 56f37644f96..5ee0c513da9 100644
--- a/include/atomic/nolock.h
+++ b/include/atomic/nolock.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#if defined(__i386__) || defined(_MSC_VER) || defined(__x86_64__) \
|| defined(HAVE_GCC_ATOMIC_BUILTINS) \
diff --git a/include/atomic/rwlock.h b/include/atomic/rwlock.h
index f6bf7d0b76f..15b40621919 100644
--- a/include/atomic/rwlock.h
+++ b/include/atomic/rwlock.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#define MY_ATOMIC_MODE_RWLOCKS 1
diff --git a/include/atomic/solaris.h b/include/atomic/solaris.h
index 7b6f0561ff0..cac34040993 100644
--- a/include/atomic/solaris.h
+++ b/include/atomic/solaris.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _atomic_h_cleanup_
#define _atomic_h_cleanup_ "atomic/solaris.h"
diff --git a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h
index 173e32e790c..679ecd3679e 100644
--- a/include/atomic/x86-gcc.h
+++ b/include/atomic/x86-gcc.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
XXX 64-bit atomic operations can be implemented using
diff --git a/include/base64.h b/include/base64.h
index 1069c286a7a..5651298eb9f 100644
--- a/include/base64.h
+++ b/include/base64.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef __BASE64_H_INCLUDED__
#define __BASE64_H_INCLUDED__
diff --git a/include/decimal.h b/include/decimal.h
index 935d341437d..8fd7f340497 100644
--- a/include/decimal.h
+++ b/include/decimal.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _decimal_h
#define _decimal_h
diff --git a/include/errmsg.h b/include/errmsg.h
index 5655883466c..252c921e896 100644
--- a/include/errmsg.h
+++ b/include/errmsg.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Error messages for MySQL clients */
/* (Error messages for the daemon are in sql/share/errmsg.txt) */
diff --git a/include/ft_global.h b/include/ft_global.h
index 73726018d0a..1fb56217113 100644
--- a/include/ft_global.h
+++ b/include/ft_global.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
diff --git a/include/hash.h b/include/hash.h
index 98bcf911db2..2d1ac3c9cdb 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Dynamic hashing of record with different key-length */
diff --git a/include/heap.h b/include/heap.h
index eecb7084e66..63d961b577a 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -11,7 +11,7 @@
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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/* This file should be included when using heap_database_functions */
diff --git a/include/keycache.h b/include/keycache.h
index 8fa9bf1cd18..5e2df48ccd1 100644
--- a/include/keycache.h
+++ b/include/keycache.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Key cache variable structures */
diff --git a/include/lf.h b/include/lf.h
index 07769d10943..21f656e3dc9 100644
--- a/include/lf.h
+++ b/include/lf.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _lf_h
#define _lf_h
diff --git a/include/m_ctype.h b/include/m_ctype.h
index 001884afe81..c5e8b379f4a 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
A better inplementation of the UNIX ctype(3) library.
diff --git a/include/m_string.h b/include/m_string.h
index 1f59fd06084..66de67c7c9d 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* There may be prolems include all of theese. Try to test in
configure with ones are needed? */
diff --git a/include/my_aes.h b/include/my_aes.h
index 58a78919023..1264f42e873 100644
--- a/include/my_aes.h
+++ b/include/my_aes.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Header file for my_aes.c */
diff --git a/include/my_alarm.h b/include/my_alarm.h
index c3707cba395..19a15a8f8e6 100644
--- a/include/my_alarm.h
+++ b/include/my_alarm.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
File to include when we want to use alarm or a loop_counter to display
diff --git a/include/my_alloc.h b/include/my_alloc.h
index 85ac75fc666..52c04fe1b7d 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Data structures for mysys/my_alloc.c (root memory allocator)
diff --git a/include/my_atomic.h b/include/my_atomic.h
index 7c589cd776a..88fdd0541aa 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This header defines five atomic operations:
diff --git a/include/my_attribute.h b/include/my_attribute.h
index 14ed35cfe24..0bdec175fb4 100644
--- a/include/my_attribute.h
+++ b/include/my_attribute.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Helper macros used for setting different __attributes__
diff --git a/include/my_bit.h b/include/my_bit.h
index 174e0f70083..ef8a8c4a2ac 100644
--- a/include/my_bit.h
+++ b/include/my_bit.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MY_BIT_INCLUDED
#define MY_BIT_INCLUDED
diff --git a/include/my_bitmap.h b/include/my_bitmap.h
index 7bed045bd86..967071a207d 100644
--- a/include/my_bitmap.h
+++ b/include/my_bitmap.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_bitmap_h_
#define _my_bitmap_h_
diff --git a/include/my_check_opt.h b/include/my_check_opt.h
index f952792d2c8..6ada51058ba 100644
--- a/include/my_check_opt.h
+++ b/include/my_check_opt.h
@@ -11,7 +11,7 @@ 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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_check_opt_h
#define _my_check_opt_h
diff --git a/include/my_compare.h b/include/my_compare.h
index 87f0aa8f3ca..1d45a332f19 100644
--- a/include/my_compare.h
+++ b/include/my_compare.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_compare_h
#define _my_compare_h
diff --git a/include/my_compiler.h b/include/my_compiler.h
index 000d4e42848..86ba250da88 100644
--- a/include/my_compiler.h
+++ b/include/my_compiler.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
Header for compiler-dependent features.
diff --git a/include/my_dbug.h b/include/my_dbug.h
index a7ada40f8bc..7fbdc6e3fb8 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_dbug_h
#define _my_dbug_h
diff --git a/include/my_dir.h b/include/my_dir.h
index 1ee002cc380..28036a32244 100644
--- a/include/my_dir.h
+++ b/include/my_dir.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MY_DIR_H
#define MY_DIR_H
diff --git a/include/my_getopt.h b/include/my_getopt.h
index e3318661c83..62ba3e63734 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_getopt_h
#define _my_getopt_h
diff --git a/include/my_global.h b/include/my_global.h
index 194e1039c60..01a1dcadb2f 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -13,7 +13,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* This is the include file that should be included 'first' in every C file. */
diff --git a/include/my_libwrap.h b/include/my_libwrap.h
index 9a017611408..b5200804170 100644
--- a/include/my_libwrap.h
+++ b/include/my_libwrap.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef HAVE_LIBWRAP
#include <tcpd.h>
diff --git a/include/my_list.h b/include/my_list.h
index 294be663d0e..0bb785bdbf3 100644
--- a/include/my_list.h
+++ b/include/my_list.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _list_h_
#define _list_h_
diff --git a/include/my_md5.h b/include/my_md5.h
index f8838aa72f7..c89a0f3973d 100644
--- a/include/my_md5.h
+++ b/include/my_md5.h
@@ -15,7 +15,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* See md5.c for explanation and copyright information. */
diff --git a/include/my_net.h b/include/my_net.h
index f8c4f99bae7..63c9e8fd6df 100644
--- a/include/my_net.h
+++ b/include/my_net.h
@@ -11,7 +11,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This file is also used to make handling of sockets and ioctl()
diff --git a/include/my_nosys.h b/include/my_nosys.h
index 97f36d00c57..ff13a04d27b 100644
--- a/include/my_nosys.h
+++ b/include/my_nosys.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Header to remove use of my_functions in functions where we need speed and
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 9b5703dedb7..200facfb929 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Defines to make different thread packages compatible */
diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h
index 38ab0de8040..13e40bab501 100644
--- a/include/my_rdtsc.h
+++ b/include/my_rdtsc.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
rdtsc3 -- multi-platform timer code
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h
index ad05a7df9ab..5b3013441e7 100644
--- a/include/my_stacktrace.h
+++ b/include/my_stacktrace.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_stacktrace_h_
#define _my_stacktrace_h_
diff --git a/include/my_sys.h b/include/my_sys.h
index 7b229bb52b0..a7142fe548d 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_sys_h
#define _my_sys_h
diff --git a/include/my_time.h b/include/my_time.h
index bcf1a8cb215..898f44b91ea 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This is a private header of sql-common library, containing
diff --git a/include/my_tree.h b/include/my_tree.h
index 1069b232360..8eb27a15875 100644
--- a/include/my_tree.h
+++ b/include/my_tree.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _tree_h
#define _tree_h
diff --git a/include/my_uctype.h b/include/my_uctype.h
index 80ef01c079a..82949ffe2ae 100644
--- a/include/my_uctype.h
+++ b/include/my_uctype.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Unicode ctype data
diff --git a/include/my_user.h b/include/my_user.h
index 46eb11a500d..b81b69a82da 100644
--- a/include/my_user.h
+++ b/include/my_user.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This is a header for libraries containing functions used in both server and
diff --git a/include/my_xml.h b/include/my_xml.h
index aee301167ff..d4a91696947 100644
--- a/include/my_xml.h
+++ b/include/my_xml.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_xml_h
diff --git a/include/myisam.h b/include/myisam.h
index 186b049b32e..7ed2a292689 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file should be included when using myisam_funktions */
diff --git a/include/myisammrg.h b/include/myisammrg.h
index 84b2d637892..136932c7db1 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file should be included when using merge_isam_funktions */
diff --git a/include/myisampack.h b/include/myisampack.h
index 0795455dc3e..22820ca7158 100644
--- a/include/myisampack.h
+++ b/include/myisampack.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Storing of values in high byte first order.
diff --git a/include/mysql.h b/include/mysql.h
index 1ed6ffe67c8..543e245d1e8 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -13,7 +13,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
This file defines the client API to MySQL and also the ABI of the
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h
index b2df0019dfe..db25239c7f7 100644
--- a/include/mysql/client_plugin.h
+++ b/include/mysql/client_plugin.h
@@ -13,7 +13,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 6b2dba46193..74c58ebde6e 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_plugin_h
#define _my_plugin_h
diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h
index 31589f071f0..4777d4216ff 100644
--- a/include/mysql/plugin_audit.h
+++ b/include/mysql/plugin_audit.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_audit_h
#define _my_audit_h
diff --git a/include/mysql/plugin_auth.h b/include/mysql/plugin_auth.h
index 156fb386aae..5050cbd922e 100644
--- a/include/mysql/plugin_auth.h
+++ b/include/mysql/plugin_auth.h
@@ -13,7 +13,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h
index c0b61730d0d..475b1e095a4 100644
--- a/include/mysql/plugin_auth_common.h
+++ b/include/mysql/plugin_auth_common.h
@@ -13,7 +13,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef _WIN32
#include <windows.h>
diff --git a/include/mysql/plugin_ftparser.h b/include/mysql/plugin_ftparser.h
index 324fce7ae86..0d0375b8b44 100644
--- a/include/mysql/plugin_ftparser.h
+++ b/include/mysql/plugin_ftparser.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_plugin_ftparser_h
#define _my_plugin_ftparser_h
diff --git a/include/mysql/service_debug_sync.h b/include/mysql/service_debug_sync.h
index f7bab99ac97..752c27b2c64 100644
--- a/include/mysql/service_debug_sync.h
+++ b/include/mysql/service_debug_sync.h
@@ -13,7 +13,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/include/mysql/service_kill_statement.h b/include/mysql/service_kill_statement.h
index 995b21f0a9f..ad7827e94af 100644
--- a/include/mysql/service_kill_statement.h
+++ b/include/mysql/service_kill_statement.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_SERVICE_KILL_STATEMENT_INCLUDED
#define MYSQL_SERVICE_KILL_STATEMENT_INCLUDED
diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h
index d4ce97076e6..064a50549ba 100644
--- a/include/mysql/service_my_snprintf.h
+++ b/include/mysql/service_my_snprintf.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/include/mysql/service_thd_alloc.h b/include/mysql/service_thd_alloc.h
index 645fb310cbc..2f783badea3 100644
--- a/include/mysql/service_thd_alloc.h
+++ b/include/mysql/service_thd_alloc.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/include/mysql/service_thd_wait.h b/include/mysql/service_thd_wait.h
index 6b47a4ff21e..cafb6b926b4 100644
--- a/include/mysql/service_thd_wait.h
+++ b/include/mysql/service_thd_wait.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_SERVICE_THD_WAIT_INCLUDED
#define MYSQL_SERVICE_THD_WAIT_INCLUDED
diff --git a/include/mysql/service_thread_scheduler.h b/include/mysql/service_thread_scheduler.h
index 5a5e0e2f520..a03c78e879e 100644
--- a/include/mysql/service_thread_scheduler.h
+++ b/include/mysql/service_thread_scheduler.h
@@ -12,7 +12,7 @@
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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
#ifndef SERVICE_THREAD_SCHEDULER_INCLUDED
diff --git a/include/mysql/services.h b/include/mysql/services.h
index 51d3bd1f909..5644f7034b8 100644
--- a/include/mysql/services.h
+++ b/include/mysql/services.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef __cplusplus
extern "C" {
diff --git a/include/mysql_com.h b/include/mysql_com.h
index d76dc72e2b8..62079d901b7 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
** Common definition between mysql server & client
diff --git a/include/mysql_embed.h b/include/mysql_embed.h
index 12b18ff965e..e9cbdb6a275 100644
--- a/include/mysql_embed.h
+++ b/include/mysql_embed.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Defines that are unique to the embedded version of MySQL */
diff --git a/include/mysql_time.h b/include/mysql_time.h
index 6ccae8d5dc2..379a8fa38b6 100644
--- a/include/mysql_time.h
+++ b/include/mysql_time.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _mysql_time_h_
#define _mysql_time_h_
diff --git a/include/mysys_err.h b/include/mysys_err.h
index f173ccd7a83..e313d82eedf 100644
--- a/include/mysys_err.h
+++ b/include/mysys_err.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _mysys_err_h
#define _mysys_err_h
diff --git a/include/password.h b/include/password.h
index 082f917e7c0..917ec1acc00 100644
--- a/include/password.h
+++ b/include/password.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef PASSWORD_INCLUDED
#define PASSWORD_INCLUDED
diff --git a/include/probes_mysql.d.base b/include/probes_mysql.d.base
index 02eb9ec1a6b..68daa5d7fc6 100644
--- a/include/probes_mysql.d.base
+++ b/include/probes_mysql.d.base
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
The actual probe names in DTrace scripts will replace '__' by '-'. Thus
diff --git a/include/probes_mysql.h b/include/probes_mysql.h
index 6d44b972cb3..ce5be041714 100644
--- a/include/probes_mysql.h
+++ b/include/probes_mysql.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef PROBES_MYSQL_H
diff --git a/include/rijndael.h b/include/rijndael.h
index 474b3250dcb..552430ae803 100644
--- a/include/rijndael.h
+++ b/include/rijndael.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
diff --git a/include/service_versions.h b/include/service_versions.h
index 21dc9c8f21d..9bb14d55b92 100644
--- a/include/service_versions.h
+++ b/include/service_versions.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef _WIN32
#define SERVICE_VERSION __declspec(dllexport) void *
diff --git a/include/sha1.h b/include/sha1.h
index c3469333c27..ac6c22ad1c2 100644
--- a/include/sha1.h
+++ b/include/sha1.h
@@ -15,7 +15,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
*/
/*
diff --git a/include/sha2.h b/include/sha2.h
index 737658e9ced..4b63847e88a 100644
--- a/include/sha2.h
+++ b/include/sha2.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef included_sha2_h
#define included_sha2_h
diff --git a/include/sql_common.h b/include/sql_common.h
index ba0e898d526..cc530ecc3ac 100644
--- a/include/sql_common.h
+++ b/include/sql_common.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifdef __cplusplus
extern "C" {
diff --git a/include/sslopt-case.h b/include/sslopt-case.h
index 2da5ff317e1..ea8d82d7471 100644
--- a/include/sslopt-case.h
+++ b/include/sslopt-case.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
case OPT_SSL_KEY:
diff --git a/include/sslopt-longopts.h b/include/sslopt-longopts.h
index 81d03e54016..699e07f948d 100644
--- a/include/sslopt-longopts.h
+++ b/include/sslopt-longopts.h
@@ -15,7 +15,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
diff --git a/include/sslopt-vars.h b/include/sslopt-vars.h
index 01093feceaf..066f7064f2b 100644
--- a/include/sslopt-vars.h
+++ b/include/sslopt-vars.h
@@ -14,7 +14,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
#ifdef SSL_VARS_NOT_STATIC
diff --git a/include/t_ctype.h b/include/t_ctype.h
index 7db3b7bbf71..9164c6222bd 100644
--- a/include/t_ctype.h
+++ b/include/t_ctype.h
@@ -12,7 +12,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved.
diff --git a/include/thr_alarm.h b/include/thr_alarm.h
index 8de70d4cdb8..250590a0e2f 100644
--- a/include/thr_alarm.h
+++ b/include/thr_alarm.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* Prototypes when using thr_alarm library functions */
diff --git a/include/thr_lock.h b/include/thr_lock.h
index 3f7a5ca988f..370b7d6db09 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -11,7 +11,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/* For use with thr_lock:s */
diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h
index a199923ff00..cc6ecf82fe0 100644
--- a/include/thread_pool_priv.h
+++ b/include/thread_pool_priv.h
@@ -13,7 +13,7 @@
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
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
#ifndef THREAD_POOL_PRIV_INCLUDED
diff --git a/include/typelib.h b/include/typelib.h
index 4504bea4ff7..dd395d41872 100644
--- a/include/typelib.h
+++ b/include/typelib.h
@@ -11,7 +11,7 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _typelib_h
diff --git a/include/welcome_copyright_notice.h b/include/welcome_copyright_notice.h
index 1b4b17cfc0d..22d8d204268 100644
--- a/include/welcome_copyright_notice.h
+++ b/include/welcome_copyright_notice.h
@@ -12,7 +12,7 @@
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 */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _welcome_copyright_notice_h_
#define _welcome_copyright_notice_h_