summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
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/solaris.h2
-rw-r--r--include/atomic/x86-gcc.h2
-rw-r--r--include/big_endian.h2
-rw-r--r--include/byte_order_generic.h2
-rw-r--r--include/byte_order_generic_x86.h2
-rw-r--r--include/byte_order_generic_x86_64.h2
-rw-r--r--include/decimal.h2
-rw-r--r--include/errmsg.h2
-rw-r--r--include/ft_global.h2
-rw-r--r--include/handler_ername.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/little_endian.h2
-rw-r--r--include/m_ctype.h2
-rw-r--r--include/m_string.h2
-rw-r--r--include/maria.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_base.h2
-rw-r--r--include/my_bit.h2
-rw-r--r--include/my_bitmap.h2
-rw-r--r--include/my_byteorder.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_cpu.h2
-rw-r--r--include/my_crypt.h2
-rw-r--r--include/my_dbug.h2
-rw-r--r--include/my_decimal_limits.h2
-rw-r--r--include/my_default.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_handler_errors.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_rnd.h2
-rw-r--r--include/my_service_manager.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_valgrind.h2
-rw-r--r--include/my_xml.h2
-rw-r--r--include/myisam.h2
-rw-r--r--include/myisamchk.h2
-rw-r--r--include/myisammrg.h2
-rw-r--r--include/myisampack.h2
-rw-r--r--include/mysql.h2
-rw-r--r--include/mysql/auth_dialog_client.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_encryption.h2
-rw-r--r--include/mysql/plugin_ftparser.h2
-rw-r--r--include/mysql/plugin_password_validation.h2
-rw-r--r--include/mysql/psi/mysql_file.h2
-rw-r--r--include/mysql/psi/mysql_idle.h2
-rw-r--r--include/mysql/psi/mysql_socket.h2
-rw-r--r--include/mysql/psi/mysql_stage.h2
-rw-r--r--include/mysql/psi/mysql_statement.h2
-rw-r--r--include/mysql/psi/mysql_table.h2
-rw-r--r--include/mysql/psi/mysql_thread.h2
-rw-r--r--include/mysql/psi/psi.h2
-rw-r--r--include/mysql/psi/psi_abi_v0.h2
-rw-r--r--include/mysql/psi/psi_abi_v1.h2
-rw-r--r--include/mysql/psi/psi_abi_v2.h2
-rw-r--r--include/mysql/psi/psi_base.h2
-rw-r--r--include/mysql/psi/psi_memory.h2
-rw-r--r--include/mysql/service_base64.h2
-rw-r--r--include/mysql/service_debug_sync.h2
-rw-r--r--include/mysql/service_encryption.h2
-rw-r--r--include/mysql/service_encryption_scheme.h2
-rw-r--r--include/mysql/service_kill_statement.h2
-rw-r--r--include/mysql/service_logger.h2
-rw-r--r--include/mysql/service_md5.h2
-rw-r--r--include/mysql/service_my_crypt.h2
-rw-r--r--include/mysql/service_my_print_error.h2
-rw-r--r--include/mysql/service_my_snprintf.h2
-rw-r--r--include/mysql/service_progress_report.h2
-rw-r--r--include/mysql/service_sha1.h2
-rw-r--r--include/mysql/service_sha2.h2
-rw-r--r--include/mysql/service_thd_alloc.h2
-rw-r--r--include/mysql/service_thd_autoinc.h2
-rw-r--r--include/mysql/service_thd_error_context.h2
-rw-r--r--include/mysql/service_thd_rnd.h2
-rw-r--r--include/mysql/service_thd_specifics.h2
-rw-r--r--include/mysql/service_thd_timezone.h2
-rw-r--r--include/mysql/service_thd_wait.h2
-rw-r--r--include/mysql/service_wsrep.h2
-rw-r--r--include/mysql/services.h2
-rw-r--r--include/mysql_async.h2
-rw-r--r--include/mysql_com.h2
-rw-r--r--include/mysql_com_server.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/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/thr_timer.h2
-rw-r--r--include/thread_pool_priv.h2
-rw-r--r--include/typelib.h2
-rw-r--r--include/violite.h4
-rw-r--r--include/waiting_threads.h2
-rw-r--r--include/welcome_copyright_notice.h2
-rw-r--r--include/wqueue.h2
-rw-r--r--include/wsrep.h2
133 files changed, 134 insertions, 134 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 8af7a1281b1..a7b98a11050 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 56a0323aedf..dd19ccd9ed6 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/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 3a081d9bbc5..18aa9b65c17 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/big_endian.h b/include/big_endian.h
index 5f6e623f6a0..6487f82924e 100644
--- a/include/big_endian.h
+++ b/include/big_endian.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Data in big-endian format.
diff --git a/include/byte_order_generic.h b/include/byte_order_generic.h
index 14b00fc87eb..451202be3b6 100644
--- a/include/byte_order_generic.h
+++ b/include/byte_order_generic.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Endianness-independent definitions for architectures other
diff --git a/include/byte_order_generic_x86.h b/include/byte_order_generic_x86.h
index 5df208ff35c..4b2cbbe5584 100644
--- a/include/byte_order_generic_x86.h
+++ b/include/byte_order_generic_x86.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Optimized function-like macros for the x86 architecture (_WIN32 included).
diff --git a/include/byte_order_generic_x86_64.h b/include/byte_order_generic_x86_64.h
index 42c1944ad21..68001ca941f 100644
--- a/include/byte_order_generic_x86_64.h
+++ b/include/byte_order_generic_x86_64.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Optimized function-like macros for the x86 architecture (_WIN32 included).
diff --git a/include/decimal.h b/include/decimal.h
index 39d617ae08d..cab18f99348 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 be4203b7f75..c0c4cfc58be 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 numbers for MySQL clients.
diff --git a/include/ft_global.h b/include/ft_global.h
index aad3b4cb56e..725363c3aa8 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/handler_ername.h b/include/handler_ername.h
index 50f7f535806..fe55062e6fb 100644
--- a/include/handler_ername.h
+++ b/include/handler_ername.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, Suite 500, Boston, MA 02110-1335 USA */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Names of all handler error numbers. Used by mysqltest */
diff --git a/include/hash.h b/include/hash.h
index 70ebb4c0492..1c30e973f92 100644
--- a/include/hash.h
+++ b/include/hash.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 */
/* Dynamic hashing of record with different key-length */
diff --git a/include/heap.h b/include/heap.h
index 2bbbc635238..d0c907a48b4 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 85937ebefb9..14fd9c80bc2 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 1825de62b43..d2538385d6f 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 INCLUDE_LF_INCLUDED
#define INCLUDE_LF_INCLUDED
diff --git a/include/little_endian.h b/include/little_endian.h
index eb704f4344f..dcddbdd9e27 100644
--- a/include/little_endian.h
+++ b/include/little_endian.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Data in little-endian format.
diff --git a/include/m_ctype.h b/include/m_ctype.h
index d27bc068ff6..dc7b77a5756 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 a2459200f4a..2f609d5e29f 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/maria.h b/include/maria.h
index 5e4cfbc3d77..cbc03687f1d 100644
--- a/include/maria.h
+++ b/include/maria.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file should be included when using maria functions */
diff --git a/include/my_alarm.h b/include/my_alarm.h
index 73bb6ab76cc..6010da6e2c3 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 2c797b5b9e8..aa5c617e593 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_base.h b/include/my_base.h
index a01744f8a50..e24805eee8d 100644
--- a/include/my_base.h
+++ b/include/my_base.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, Suite 500, Boston, MA 02110-1335 USA */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* This file includes constants used with all databases */
diff --git a/include/my_bit.h b/include/my_bit.h
index 1f97e80143a..4db6efcac8c 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 3e242280be4..9cd8b0ca1e8 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_byteorder.h b/include/my_byteorder.h
index 1f29248bfb2..c302781d9fc 100644
--- a/include/my_byteorder.h
+++ b/include/my_byteorder.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 */
/*
diff --git a/include/my_check_opt.h b/include/my_check_opt.h
index ccf003decab..f5ec522ed78 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 f4e9ecbf80b..b973664372a 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 997c474b129..12e6c1a087c 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_cpu.h b/include/my_cpu.h
index a67c0e976d6..ebabe6c7202 100644
--- a/include/my_cpu.h
+++ b/include/my_cpu.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 02111-1301 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
*/
/* instructions for specific cpu's */
diff --git a/include/my_crypt.h b/include/my_crypt.h
index 719e349bfb9..eced2cd400f 100644
--- a/include/my_crypt.h
+++ b/include/my_crypt.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 MY_CRYPT_INCLUDED
#define MY_CRYPT_INCLUDED
diff --git a/include/my_dbug.h b/include/my_dbug.h
index 003290afb96..0fe40a9e8cb 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_decimal_limits.h b/include/my_decimal_limits.h
index 92be53d051b..ac1df83bb62 100644
--- a/include/my_decimal_limits.h
+++ b/include/my_decimal_limits.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#define DECIMAL_LONGLONG_DIGITS 22
#define DECIMAL_LONG_DIGITS 10
diff --git a/include/my_default.h b/include/my_default.h
index bd3a21f03a8..865833de34a 100644
--- a/include/my_default.h
+++ b/include/my_default.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Definitions for mysys/my_default.c */
diff --git a/include/my_dir.h b/include/my_dir.h
index 949a9a4d354..a2e04a488f0 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 584c009464d..c6aa21eda2e 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 719464933b8..4ce4671c571 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_handler_errors.h b/include/my_handler_errors.h
index 082e6effdab..87e52f141c7 100644
--- a/include/my_handler_errors.h
+++ b/include/my_handler_errors.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, Suite 500, Boston, MA 02110-1335 USA */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
Errors a handler can give you
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 141ea309cae..c3919bf158f 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 */
#include "m_string.h"
diff --git a/include/my_net.h b/include/my_net.h
index 91d780a276d..bd42ccf6336 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 dfd479fed36..2b3f4f14ea3 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 d24e2116733..df421225f4f 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_rnd.h b/include/my_rnd.h
index ab8b3e10d23..a3e3788085d 100644
--- a/include/my_rnd.h
+++ b/include/my_rnd.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _my_rnd_h
#define _my_rnd_h
diff --git a/include/my_service_manager.h b/include/my_service_manager.h
index d9f41ace4d5..95b5235e755 100644
--- a/include/my_service_manager.h
+++ b/include/my_service_manager.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
*/
diff --git a/include/my_stacktrace.h b/include/my_stacktrace.h
index fad6e532de9..6aaf6728c72 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 50a659239b3..c1d81108a84 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 02e8f32ee23..80089fa2c64 100644
--- a/include/my_time.h
+++ b/include/my_time.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 is a private header of sql-common library, containing
diff --git a/include/my_tree.h b/include/my_tree.h
index 59d02218a21..d0c898f7659 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 404996e996c..a4b39edad77 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_valgrind.h b/include/my_valgrind.h
index cf3037da98b..cd81f109455 100644
--- a/include/my_valgrind.h
+++ b/include/my_valgrind.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* clang -> gcc */
#ifndef __has_feature
diff --git a/include/my_xml.h b/include/my_xml.h
index cd7665df9da..846448a06d9 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 fea28bfe459..26857b4ac32 100644
--- a/include/myisam.h
+++ b/include/myisam.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 should be included when using myisam_funktions */
diff --git a/include/myisamchk.h b/include/myisamchk.h
index 1a9605aac46..883165b78fd 100644
--- a/include/myisamchk.h
+++ b/include/myisamchk.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Definitions needed for myisamchk/mariachk.c */
diff --git a/include/myisammrg.h b/include/myisammrg.h
index 89293537989..a1b921bbbc3 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 cfe1fcbc24a..eb5baf5fc56 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 4b9a7d27ad2..07702a54dba 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/auth_dialog_client.h b/include/mysql/auth_dialog_client.h
index 5cbafcc22cc..f1ad3e6983d 100644
--- a/include/mysql/auth_dialog_client.h
+++ b/include/mysql/auth_dialog_client.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/include/mysql/client_plugin.h b/include/mysql/client_plugin.h
index 84fb3c6798d..990cecc9773 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 ad5a792173a..3a522af8a9e 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 MYSQL_PLUGIN_INCLUDED
#define MYSQL_PLUGIN_INCLUDED
diff --git a/include/mysql/plugin_audit.h b/include/mysql/plugin_audit.h
index 10039c4c1fa..2a3a59eea72 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 807bfd4e652..561acbf2226 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 9d7dd2a08bf..8edd7128754 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_encryption.h b/include/mysql/plugin_encryption.h
index 5d08f6d3067..3c574aa436c 100644
--- a/include/mysql/plugin_encryption.h
+++ b/include/mysql/plugin_encryption.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/plugin_ftparser.h b/include/mysql/plugin_ftparser.h
index 4dace4ef3a6..99bb6b24f3f 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/plugin_password_validation.h b/include/mysql/plugin_password_validation.h
index 18c643e877b..894d17cba0f 100644
--- a/include/mysql/plugin_password_validation.h
+++ b/include/mysql/plugin_password_validation.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/psi/mysql_file.h b/include/mysql/psi/mysql_file.h
index be9d7116b9b..0b7d73e5953 100644
--- a/include/mysql/psi/mysql_file.h
+++ b/include/mysql/psi/mysql_file.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_FILE_H
#define MYSQL_FILE_H
diff --git a/include/mysql/psi/mysql_idle.h b/include/mysql/psi/mysql_idle.h
index b623edce108..b37495ebb7d 100644
--- a/include/mysql/psi/mysql_idle.h
+++ b/include/mysql/psi/mysql_idle.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_IDLE_H
#define MYSQL_IDLE_H
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h
index 3becd2c538c..bdb60c4ad57 100644
--- a/include/mysql/psi/mysql_socket.h
+++ b/include/mysql/psi/mysql_socket.h
@@ -14,7 +14,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 St, Fifth Floor, Boston, MA
-02110-1301 USA
+02110-1335 USA
*/
#ifndef MYSQL_SOCKET_H
diff --git a/include/mysql/psi/mysql_stage.h b/include/mysql/psi/mysql_stage.h
index 91a5c12f82e..b6ab09fef55 100644
--- a/include/mysql/psi/mysql_stage.h
+++ b/include/mysql/psi/mysql_stage.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_STAGE_H
#define MYSQL_STAGE_H
diff --git a/include/mysql/psi/mysql_statement.h b/include/mysql/psi/mysql_statement.h
index 05016130af7..33c61a63505 100644
--- a/include/mysql/psi/mysql_statement.h
+++ b/include/mysql/psi/mysql_statement.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 MYSQL_STATEMENT_H
#define MYSQL_STATEMENT_H
diff --git a/include/mysql/psi/mysql_table.h b/include/mysql/psi/mysql_table.h
index 5b4b64a8e48..7584fec2243 100644
--- a/include/mysql/psi/mysql_table.h
+++ b/include/mysql/psi/mysql_table.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_TABLE_H
#define MYSQL_TABLE_H
diff --git a/include/mysql/psi/mysql_thread.h b/include/mysql/psi/mysql_thread.h
index 54a0eaabef7..c9ea4251ad3 100644
--- a/include/mysql/psi/mysql_thread.h
+++ b/include/mysql/psi/mysql_thread.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_THREAD_H
#define MYSQL_THREAD_H
diff --git a/include/mysql/psi/psi.h b/include/mysql/psi/psi.h
index 3f43445e08a..6feb1f87fa7 100644
--- a/include/mysql/psi/psi.h
+++ b/include/mysql/psi/psi.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_PERFORMANCE_SCHEMA_INTERFACE_H
#define MYSQL_PERFORMANCE_SCHEMA_INTERFACE_H
diff --git a/include/mysql/psi/psi_abi_v0.h b/include/mysql/psi/psi_abi_v0.h
index c896f15a532..0601b61a5c7 100644
--- a/include/mysql/psi/psi_abi_v0.h
+++ b/include/mysql/psi/psi_abi_v0.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file mysql/psi/psi_abi_v0.h
diff --git a/include/mysql/psi/psi_abi_v1.h b/include/mysql/psi/psi_abi_v1.h
index 54c49f0c518..2d5e81f5972 100644
--- a/include/mysql/psi/psi_abi_v1.h
+++ b/include/mysql/psi/psi_abi_v1.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file mysql/psi/psi_abi_v1.h
diff --git a/include/mysql/psi/psi_abi_v2.h b/include/mysql/psi/psi_abi_v2.h
index d2e6f2527b0..420cc63fc13 100644
--- a/include/mysql/psi/psi_abi_v2.h
+++ b/include/mysql/psi/psi_abi_v2.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file mysql/psi/psi_abi_v1.h
diff --git a/include/mysql/psi/psi_base.h b/include/mysql/psi/psi_base.h
index 10593c4dab4..2bb3061d55c 100644
--- a/include/mysql/psi/psi_base.h
+++ b/include/mysql/psi/psi_base.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_PSI_BASE_H
#define MYSQL_PSI_BASE_H
diff --git a/include/mysql/psi/psi_memory.h b/include/mysql/psi/psi_memory.h
index 725b3ed77d0..3c633e6a918 100644
--- a/include/mysql/psi/psi_memory.h
+++ b/include/mysql/psi/psi_memory.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,
- 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_PSI_MEMORY_H
#define MYSQL_PSI_MEMORY_H
diff --git a/include/mysql/service_base64.h b/include/mysql/service_base64.h
index b4914d2c3c0..43b5ba323ba 100644
--- a/include/mysql/service_base64.h
+++ b/include/mysql/service_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 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_debug_sync.h b/include/mysql/service_debug_sync.h
index eee8e6bbe96..0bd49a13458 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_encryption.h b/include/mysql/service_encryption.h
index 77afc047372..a4e908f9aff 100644
--- a/include/mysql/service_encryption.h
+++ b/include/mysql/service_encryption.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_encryption_scheme.h b/include/mysql/service_encryption_scheme.h
index 195c7aa4a5c..bcd4d646d9e 100644
--- a/include/mysql/service_encryption_scheme.h
+++ b/include/mysql/service_encryption_scheme.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_kill_statement.h b/include/mysql/service_kill_statement.h
index bfb222301eb..9f3415a7de5 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_logger.h b/include/mysql/service_logger.h
index aa2c1b335e3..5979901bdd0 100644
--- a/include/mysql/service_logger.h
+++ b/include/mysql/service_logger.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_SERVICE_LOGGER_INCLUDED
#define MYSQL_SERVICE_LOGGER_INCLUDED
diff --git a/include/mysql/service_md5.h b/include/mysql/service_md5.h
index 5e589e57415..336cf70f85e 100644
--- a/include/mysql/service_md5.h
+++ b/include/mysql/service_md5.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_my_crypt.h b/include/mysql/service_my_crypt.h
index 83de0378e4a..de4a8bb69da 100644
--- a/include/mysql/service_my_crypt.h
+++ b/include/mysql/service_my_crypt.h
@@ -16,7 +16,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_my_print_error.h b/include/mysql/service_my_print_error.h
index 636151655e5..4026233ea5b 100644
--- a/include/mysql/service_my_print_error.h
+++ b/include/mysql/service_my_print_error.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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef MYSQL_SERVICE_MY_PRINT_ERROR_INCLUDED
#define MYSQL_SERVICE_MY_PRINT_ERROR_INCLUDED
diff --git a/include/mysql/service_my_snprintf.h b/include/mysql/service_my_snprintf.h
index 4a99561dd00..bd1f069c527 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_progress_report.h b/include/mysql/service_progress_report.h
index fc935b6bd0c..11fc24dc3b8 100644
--- a/include/mysql/service_progress_report.h
+++ b/include/mysql/service_progress_report.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/**
@file
diff --git a/include/mysql/service_sha1.h b/include/mysql/service_sha1.h
index e000c898dd7..d864e23fa84 100644
--- a/include/mysql/service_sha1.h
+++ b/include/mysql/service_sha1.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_sha2.h b/include/mysql/service_sha2.h
index ee4975f7f24..00834a9b8f4 100644
--- a/include/mysql/service_sha2.h
+++ b/include/mysql/service_sha2.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 aa275c57dfc..8b3ac707fc1 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_autoinc.h b/include/mysql/service_thd_autoinc.h
index a4e336ab232..28bd2bb1a5e 100644
--- a/include/mysql/service_thd_autoinc.h
+++ b/include/mysql/service_thd_autoinc.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_error_context.h b/include/mysql/service_thd_error_context.h
index 7619aa44082..0b9082dd314 100644
--- a/include/mysql/service_thd_error_context.h
+++ b/include/mysql/service_thd_error_context.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_rnd.h b/include/mysql/service_thd_rnd.h
index 21133c7889f..78a93fe172a 100644
--- a/include/mysql/service_thd_rnd.h
+++ b/include/mysql/service_thd_rnd.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_specifics.h b/include/mysql/service_thd_specifics.h
index 161385c387e..a4078bd5cc0 100644
--- a/include/mysql/service_thd_specifics.h
+++ b/include/mysql/service_thd_specifics.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_timezone.h b/include/mysql/service_thd_timezone.h
index f44f011b891..89e75274cf0 100644
--- a/include/mysql/service_thd_timezone.h
+++ b/include/mysql/service_thd_timezone.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 c35b35df820..c20878fd85b 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_wsrep.h b/include/mysql/service_wsrep.h
index 9ef47207a07..3b01d983c06 100644
--- a/include/mysql/service_wsrep.h
+++ b/include/mysql/service_wsrep.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/services.h b/include/mysql/services.h
index 6168c5ed8dc..986d430dbf1 100644
--- a/include/mysql/services.h
+++ b/include/mysql/services.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 __cplusplus
extern "C" {
diff --git a/include/mysql_async.h b/include/mysql_async.h
index 32c1116dc58..3e4cb351bb5 100644
--- a/include/mysql_async.h
+++ b/include/mysql_async.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/* Common definitions for MariaDB non-blocking client library. */
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 17366e22da8..a63bcc9d87e 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_com_server.h b/include/mysql_com_server.h
index 1ea040207d4..d8bf531c105 100644
--- a/include/mysql_com_server.h
+++ b/include/mysql_com_server.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 */
/*
Definitions private to the server,
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 24fd7ed6102..ef78441ba40 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 753d6444475..6e138fab5a4 100644
--- a/include/service_versions.h
+++ b/include/service_versions.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 _WIN32
#define SERVICE_VERSION __declspec(dllexport) void *
diff --git a/include/sql_common.h b/include/sql_common.h
index ca7d2618bb9..9836d0c1cdc 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 4a8c65948cb..fe53088e89b 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 e605d0134e7..be64e7f6590 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 8e669760faf..c65aa693b76 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 e6451bf21c4..35db9ef981b 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.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 */
/* For use with thr_lock:s */
diff --git a/include/thr_timer.h b/include/thr_timer.h
index 724fdac41c8..4f0c4f08660 100644
--- a/include/thr_timer.h
+++ b/include/thr_timer.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_timer functions */
diff --git a/include/thread_pool_priv.h b/include/thread_pool_priv.h
index 79cfb6b4040..f27391adbfa 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 0d633e57e5a..530767ebe01 100644
--- a/include/typelib.h
+++ b/include/typelib.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 _typelib_h
diff --git a/include/violite.h b/include/violite.h
index 5dcf27dbab1..45273ac5f24 100644
--- a/include/violite.h
+++ b/include/violite.h
@@ -11,8 +11,8 @@
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 */
+ along with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
/*
* Vio Lite.
diff --git a/include/waiting_threads.h b/include/waiting_threads.h
index cd4db35701c..217b49bd8b2 100644
--- a/include/waiting_threads.h
+++ b/include/waiting_threads.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef _waiting_threads_h
#define _waiting_threads_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_
diff --git a/include/wqueue.h b/include/wqueue.h
index 69cb715a97d..ce7fe4e4057 100644
--- a/include/wqueue.h
+++ b/include/wqueue.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#ifndef WQUEUE_INCLUDED
#define WQUEUE_INCLUDED
diff --git a/include/wsrep.h b/include/wsrep.h
index d9800b7014f..f0d42265ec5 100644
--- a/include/wsrep.h
+++ b/include/wsrep.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 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include <my_config.h>