Merge branch '5.5' into 10.1

19 files changed, 19 insertions, 19 deletions

diff --git a/libservices/CMakeLists.txt b/libservices/CMakeLists.txt
index e20be6d7a7c..819775371d3 100644
--- a/libservices/CMakeLists.txt
+++ b/libservices/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
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
diff --git a/libservices/base64_service.c b/libservices/base64_service.c
index af35ccd2a1c..d892f39f2ef 100644
--- a/libservices/base64_service.c
+++ b/libservices/base64_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION base64_service= (void*)VERSION_base64;
diff --git a/libservices/debug_sync_service.c b/libservices/debug_sync_service.c
index 3afa088dee7..364e753af5d 100644
--- a/libservices/debug_sync_service.c
+++ b/libservices/debug_sync_service.c
@@ -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 <service_versions.h>
diff --git a/libservices/encryption_scheme_service.c b/libservices/encryption_scheme_service.c
index 87d85df16b4..a27fe1621a0 100644
--- a/libservices/encryption_scheme_service.c
+++ b/libservices/encryption_scheme_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION encryption_scheme_service= (void*)VERSION_encryption_scheme;
diff --git a/libservices/encryption_service.c b/libservices/encryption_service.c
index f57575ae3e8..bf31aacdc90 100644
--- a/libservices/encryption_service.c
+++ b/libservices/encryption_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION encryption_service= (void*)VERSION_encryption;
diff --git a/libservices/kill_statement_service.c b/libservices/kill_statement_service.c
index 4c7cacb241d..c3d1e31736a 100644
--- a/libservices/kill_statement_service.c
+++ b/libservices/kill_statement_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION thd_kill_statement_service= (void*)VERSION_kill_statement;
diff --git a/libservices/my_md5_service.c b/libservices/my_md5_service.c
index f993751a9a5..3937f6c97d3 100644
--- a/libservices/my_md5_service.c
+++ b/libservices/my_md5_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION my_md5_service= (void*)VERSION_my_md5;
diff --git a/libservices/my_print_error_service.c b/libservices/my_print_error_service.c
index 7642668d470..85ab4b7424a 100644
--- a/libservices/my_print_error_service.c
+++ b/libservices/my_print_error_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION my_print_error_service= (void*)VERSION_my_print_error;
\ No newline at end of file
diff --git a/libservices/my_sha1_service.c b/libservices/my_sha1_service.c
index 196c1939082..7a8c3c698b7 100644
--- a/libservices/my_sha1_service.c
+++ b/libservices/my_sha1_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION my_sha1_service= (void*)VERSION_my_sha1;
diff --git a/libservices/my_sha2_service.c b/libservices/my_sha2_service.c
index aa174e7d1f0..040deb6e390 100644
--- a/libservices/my_sha2_service.c
+++ b/libservices/my_sha2_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION my_sha2_service= (void*)VERSION_my_sha2;
diff --git a/libservices/my_snprintf_service.c b/libservices/my_snprintf_service.c
index 8ac507394b0..6609cd144a6 100644
--- a/libservices/my_snprintf_service.c
+++ b/libservices/my_snprintf_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION my_snprintf_service= (void*)VERSION_my_snprintf;
diff --git a/libservices/thd_alloc_service.c b/libservices/thd_alloc_service.c
index 54e498c6cd1..cf8f514e765 100644
--- a/libservices/thd_alloc_service.c
+++ b/libservices/thd_alloc_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION thd_alloc_service= (void*)VERSION_thd_alloc;
diff --git a/libservices/thd_autoinc_service.c b/libservices/thd_autoinc_service.c
index cb859a70e55..bfaec3438e5 100644
--- a/libservices/thd_autoinc_service.c
+++ b/libservices/thd_autoinc_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION thd_autoinc_service= (void *) VERSION_thd_autoinc;
diff --git a/libservices/thd_error_context_service.c b/libservices/thd_error_context_service.c
index 80eb6263b52..3acb0ea7ef8 100644
--- a/libservices/thd_error_context_service.c
+++ b/libservices/thd_error_context_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION thd_error_context_service= (void *) VERSION_thd_error_context;
diff --git a/libservices/thd_rnd_service.c b/libservices/thd_rnd_service.c
index fbba611a8ff..cc3a99ea663 100644
--- a/libservices/thd_rnd_service.c
+++ b/libservices/thd_rnd_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION thd_rnd_service= (void *) VERSION_thd_rnd;
diff --git a/libservices/thd_specifics_service.c b/libservices/thd_specifics_service.c
index 19d4eb28045..f11381e8258 100644
--- a/libservices/thd_specifics_service.c
+++ b/libservices/thd_specifics_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION thd_specifics_service= (void *) VERSION_thd_specifics;
diff --git a/libservices/thd_timezone_service.c b/libservices/thd_timezone_service.c
index 2c93453f8ca..89d8c1a64ca 100644
--- a/libservices/thd_timezone_service.c
+++ b/libservices/thd_timezone_service.c
@@ -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 <service_versions.h>
 SERVICE_VERSION thd_timezone_service= (void *) VERSION_thd_timezone;
diff --git a/libservices/thd_wait_service.c b/libservices/thd_wait_service.c
index 1f8c19ac555..a8424ae0614 100644
--- a/libservices/thd_wait_service.c
+++ b/libservices/thd_wait_service.c
@@ -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 <service_versions.h>
diff --git a/libservices/wsrep_service.c b/libservices/wsrep_service.c
index cdd7e400571..ceb7ebf9d9a 100644
--- a/libservices/wsrep_service.c
+++ b/libservices/wsrep_service.c
@@ -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 <service_versions.h>