Merge branch '5.5' into 10.1

51 files changed, 51 insertions, 51 deletions

diff --git a/cmake/abi_check.cmake b/cmake/abi_check.cmake
index 02124ae7ba1..805322229c4 100644
--- a/cmake/abi_check.cmake
+++ b/cmake/abi_check.cmake
@@ -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 
  
 #
 # Headers which need to be checked for abi/api compatibility are in
diff --git a/cmake/bison.cmake b/cmake/bison.cmake
index 0892a213d04..24adcb788d9 100644
--- a/cmake/bison.cmake
+++ b/cmake/bison.cmake
@@ -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 
 
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
  # On Solaris, /opt/csw often contains a newer bison 
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 709d97ec693..64432e07939 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -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 includes build settings used for MySQL release
 
diff --git a/cmake/bzip2.cmake b/cmake/bzip2.cmake
index 0c15853d0b9..26fd703120e 100644
--- a/cmake/bzip2.cmake
+++ b/cmake/bzip2.cmake
@@ -10,7 +10,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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 SET(WITH_INNODB_BZIP2 AUTO CACHE STRING
   "Build with bzip2. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
diff --git a/cmake/cat.cmake b/cmake/cat.cmake
index 1ffe2ecfa1d..3a76b20da99 100644
--- a/cmake/cat.cmake
+++ b/cmake/cat.cmake
@@ -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 
 
 # Concatenate files
 #
diff --git a/cmake/character_sets.cmake b/cmake/character_sets.cmake
index 1c93441cbb1..37de79758b3 100644
--- a/cmake/character_sets.cmake
+++ b/cmake/character_sets.cmake
@@ -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 
 
 # Charsets and collations
 IF(NOT DEFAULT_CHARSET)
diff --git a/cmake/check_minimal_version.cmake b/cmake/check_minimal_version.cmake
index d96c6a93418..5bef555b32d 100644
--- a/cmake/check_minimal_version.cmake
+++ b/cmake/check_minimal_version.cmake
@@ -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 helper script is used to check for the minimal required version
 # It helps to decide whether to use autoconf based configure or cmake's
diff --git a/cmake/cmake_parse_arguments.cmake b/cmake/cmake_parse_arguments.cmake
index 487fe2bacd9..800fef6e728 100644
--- a/cmake/cmake_parse_arguments.cmake
+++ b/cmake/cmake_parse_arguments.cmake
@@ -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
 
 # Handy macro to parse macro arguments
 MACRO(MYSQL_PARSE_ARGUMENTS prefix arg_names option_names)
diff --git a/cmake/compile_flags.cmake b/cmake/compile_flags.cmake
index b39bf7b79d6..a87846e9915 100644
--- a/cmake/compile_flags.cmake
+++ b/cmake/compile_flags.cmake
@@ -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
 
 
 ## ADD_COMPILE_FLAGS(<source files> COMPILE_FLAGS <flags>)
diff --git a/cmake/configure.pl b/cmake/configure.pl
index 68baf436c1c..70122664ad4 100644
--- a/cmake/configure.pl
+++ b/cmake/configure.pl
@@ -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
 
 use strict;
 use Cwd 'abs_path';
diff --git a/cmake/cpack_source_ignore_files.cmake b/cmake/cpack_source_ignore_files.cmake
index 8e1b7bd5eda..65abf9e8a9d 100644
--- a/cmake/cpack_source_ignore_files.cmake
+++ b/cmake/cpack_source_ignore_files.cmake
@@ -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(CPACK_SOURCE_IGNORE_FILES
 \\\\.git/
diff --git a/cmake/cpu_info.cmake b/cmake/cpu_info.cmake
index 1772510e72b..f3ddd33df3a 100644
--- a/cmake/cpu_info.cmake
+++ b/cmake/cpu_info.cmake
@@ -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 
 
 # Symbols with information about the CPU.
 
diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in
index c77e28d882c..4847d5ef35d 100644
--- a/cmake/create_initial_db.cmake.in
+++ b/cmake/create_initial_db.cmake.in
@@ -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 script creates initial database for packaging on Windows
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
diff --git a/cmake/do_abi_check.cmake b/cmake/do_abi_check.cmake
index c0ffce353f3..43d8b15a7ab 100644
--- a/cmake/do_abi_check.cmake
+++ b/cmake/do_abi_check.cmake
@@ -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 
 
 #
 # Rules for checking that the abi/api has not changed.
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake
index bb45eaf865b..4e0f7501045 100644
--- a/cmake/dtrace.cmake
+++ b/cmake/dtrace.cmake
@@ -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 
 
 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
   AND CMAKE_SIZEOF_VOID_P EQUAL 4)
diff --git a/cmake/dtrace_prelink.cmake b/cmake/dtrace_prelink.cmake
index 0efc2bb64bb..f2e678f06d5 100644
--- a/cmake/dtrace_prelink.cmake
+++ b/cmake/dtrace_prelink.cmake
@@ -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 
 
 # Generates an ELF object file with dtrace entry points.
 # This object that must to be linked with together with 
diff --git a/cmake/info_bin.cmake b/cmake/info_bin.cmake
index 9cec3de0e0f..d59b512bcec 100644
--- a/cmake/info_bin.cmake
+++ b/cmake/info_bin.cmake
@@ -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
 
 
 # The sole purpose of this cmake control file is to create the "INFO_BIN" file.
diff --git a/cmake/info_macros.cmake.in b/cmake/info_macros.cmake.in
index 89b04666c96..89ca1ec79dc 100644
--- a/cmake/info_macros.cmake.in
+++ b/cmake/info_macros.cmake.in
@@ -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 
 
 
 # Handle/create the "INFO_*" files describing a MariaDB (server) binary.
diff --git a/cmake/info_src.cmake b/cmake/info_src.cmake
index ce9873cc9d0..df6249f111e 100644
--- a/cmake/info_src.cmake
+++ b/cmake/info_src.cmake
@@ -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
 
 
 # The sole purpose of this cmake control file is to create the "INFO_SRC" file.
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 5484691e94a..e4d317e979c 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -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 
 
 # The purpose of this file is to set the default installation layout.
 #
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index b0263e63b7a..0c05b06208f 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -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 
 
 GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake)
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
index 2a218bc63b0..00d2def5877 100644
--- a/cmake/libutils.cmake
+++ b/cmake/libutils.cmake
@@ -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 exports macros that emulate some functionality found  in GNU libtool
diff --git a/cmake/lz4.cmake b/cmake/lz4.cmake
index ec0e2aa85df..098bf54f64a 100644
--- a/cmake/lz4.cmake
+++ b/cmake/lz4.cmake
@@ -10,7 +10,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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 SET(WITH_INNODB_LZ4 AUTO CACHE STRING
   "Build with lz4. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
diff --git a/cmake/lzma.cmake b/cmake/lzma.cmake
index 12a28a17a43..93de0a2934d 100644
--- a/cmake/lzma.cmake
+++ b/cmake/lzma.cmake
@@ -10,7 +10,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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 SET(WITH_INNODB_LZMA AUTO CACHE STRING
   "Build with lzma. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
diff --git a/cmake/lzo.cmake b/cmake/lzo.cmake
index 07cba011c06..236eac2d1e5 100644
--- a/cmake/lzo.cmake
+++ b/cmake/lzo.cmake
@@ -10,7 +10,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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 SET(WITH_INNODB_LZO AUTO CACHE STRING
   "Build with lzo. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake
index caba370c4ae..8c2deeb8e40 100644
--- a/cmake/maintainer.cmake
+++ b/cmake/maintainer.cmake
@@ -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
 
 # Common warning flags for GCC, G++, Clang and Clang++
 SET(MY_WARNING_FLAGS
diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in
index f35d16834b6..d9153604a46 100644
--- a/cmake/make_dist.cmake.in
+++ b/cmake/make_dist.cmake.in
@@ -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 
 
 # Make source distribution
 # If bzr is present, run bzr export.
diff --git a/cmake/merge_archives_unix.cmake.in b/cmake/merge_archives_unix.cmake.in
index d05336d6c91..7bb5f54f411 100644
--- a/cmake/merge_archives_unix.cmake.in
+++ b/cmake/merge_archives_unix.cmake.in
@@ -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 script merges many static libraries into
 # one big library on Unix.
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake
index c8a2e522d66..12635f2b582 100644
--- a/cmake/mysql_add_executable.cmake
+++ b/cmake/mysql_add_executable.cmake
@@ -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
 
 # Add executable plus some additional MySQL specific stuff
 # Usage (same as for standard CMake's ADD_EXECUTABLE)
diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index 1802b1a2678..ca8dafaa465 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -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 
 
 #
 # Global constants, only to be changed between major releases.
diff --git a/cmake/os/AIX.cmake b/cmake/os/AIX.cmake
index c86392f8bc4..12ddf30d440 100644
--- a/cmake/os/AIX.cmake
+++ b/cmake/os/AIX.cmake
@@ -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 
 
 
 #Enable 64 bit file offsets
diff --git a/cmake/os/Cygwin.cmake b/cmake/os/Cygwin.cmake
index 9c29277c626..a54241654a6 100644
--- a/cmake/os/Cygwin.cmake
+++ b/cmake/os/Cygwin.cmake
@@ -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 
 
 # Cygwin is not Windows
 SET(WIN32 0)
\ No newline at end of file
diff --git a/cmake/os/Darwin.cmake b/cmake/os/Darwin.cmake
index 4ac72070e8b..21e18360dfe 100644
--- a/cmake/os/Darwin.cmake
+++ b/cmake/os/Darwin.cmake
@@ -11,6 +11,6 @@
 #
 # 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 includes OSX specific options and quirks, related to system checks
diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake
index ffb89c81206..b9c335e4ddf 100644
--- a/cmake/os/FreeBSD.cmake
+++ b/cmake/os/FreeBSD.cmake
@@ -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 includes FreeBSD specific options and quirks, related to system checks
 
diff --git a/cmake/os/HP-UX.cmake b/cmake/os/HP-UX.cmake
index 4cadddc7b18..5bbc799427e 100644
--- a/cmake/os/HP-UX.cmake
+++ b/cmake/os/HP-UX.cmake
@@ -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
 
 INCLUDE(CheckCXXSourceCompiles)
 # Enable 64 bit file offsets
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
index 55be8674802..2bd98c79d1f 100644
--- a/cmake/os/Linux.cmake
+++ b/cmake/os/Linux.cmake
@@ -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 includes Linux specific options and quirks, related to system checks
 
diff --git a/cmake/os/OS400.cmake b/cmake/os/OS400.cmake
index 502eeccc30a..5a9b2aba64d 100644
--- a/cmake/os/OS400.cmake
+++ b/cmake/os/OS400.cmake
@@ -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 
 
 GET_FILENAME_COMPONENT(_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 INCLUDE(${_SCRIPT_DIR}/AIX.cmake)
\ No newline at end of file
diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake
index d5a4b5c96b0..4a77b53fb31 100644
--- a/cmake/os/SunOS.cmake
+++ b/cmake/os/SunOS.cmake
@@ -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 
 
 INCLUDE(CheckSymbolExists)
 INCLUDE(CheckCSourceRuns)
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index 803c951541c..2e7577ec5e9 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -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 includes Windows specific hacks, mostly around compiler flags
 
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
index 07a8085a411..a4d46df2af6 100644
--- a/cmake/os/WindowsCache.cmake
+++ b/cmake/os/WindowsCache.cmake
@@ -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 
 
 # Avoid system checks on Windows by pre-caching  results. Most of the system checks 
 # are not relevant for Windows anyway and it takes lot more time to run them,
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index a8bd1596f47..8acf52f1bb3 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -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
 
 # Produce meaningful package name for the binary package
 # The logic is rather involved with special cases for  different OSes
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 4396a0a6c25..c9c18f7c079 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -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 
 
 
 GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
diff --git a/cmake/readline.cmake b/cmake/readline.cmake
index 9cfbe4f0d55..082dd04cf4a 100644
--- a/cmake/readline.cmake
+++ b/cmake/readline.cmake
@@ -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 
 
 INCLUDE(CheckCXXSourceCompiles)
 
diff --git a/cmake/snappy.cmake b/cmake/snappy.cmake
index cb0839a3480..2810472cef6 100644
--- a/cmake/snappy.cmake
+++ b/cmake/snappy.cmake
@@ -10,7 +10,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
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
 
 SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
   "Build with snappy. Possible values are 'ON', 'OFF', 'AUTO' and default is 'AUTO'")
diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index 308f725a02d..fef78600de2 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -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
 
 # We support different versions of SSL:
 # - "bundled" uses source code in <source dir>/extra/yassl
diff --git a/cmake/stack_direction.c b/cmake/stack_direction.c
index d75bbbfa035..1f7a5d0b135 100644
--- a/cmake/stack_direction.c
+++ b/cmake/stack_direction.c
@@ -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 */
 
 /* Check stack direction (0-down, 1-up) */
 int f(int *a) 
diff --git a/cmake/systemd.cmake b/cmake/systemd.cmake
index 478930c9f3d..89894e89f8a 100644
--- a/cmake/systemd.cmake
+++ b/cmake/systemd.cmake
@@ -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
 
 INCLUDE(FindPkgConfig)
 # http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html
diff --git a/cmake/tags.cmake b/cmake/tags.cmake
index 07c1411a1d6..309bfae9832 100644
--- a/cmake/tags.cmake
+++ b/cmake/tags.cmake
@@ -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 
 
 # Generate tag files
 IF(UNIX)
diff --git a/cmake/versioninfo.rc.in b/cmake/versioninfo.rc.in
index cd880b917e0..29b39353124 100644
--- a/cmake/versioninfo.rc.in
+++ b/cmake/versioninfo.rc.in
@@ -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
 
 #include <windows.h>
 VS_VERSION_INFO VERSIONINFO
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
index b272df51adb..a1e8fc39fca 100644
--- a/cmake/wsrep.cmake
+++ b/cmake/wsrep.cmake
@@ -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 
 
 #
 # Galera library does not compile with windows
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake
index e269c473f36..628bbf15f67 100644
--- a/cmake/zlib.cmake
+++ b/cmake/zlib.cmake
@@ -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 
 
 MACRO (MYSQL_USE_BUNDLED_ZLIB)
   SET(ZLIB_INCLUDE_DIR  ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_BINARY_DIR}/zlib)