Merge branch '5.5' into 10.1

35 files changed, 36 insertions, 36 deletions

diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
index 2a7f0b71cc8..ea6eaa8c25e 100644
--- a/strings/CMakeLists.txt
+++ b/strings/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/strings/conf_to_src.c b/strings/conf_to_src.c
index 28d2fd1515e..6c352db7437 100644
--- a/strings/conf_to_src.c
+++ b/strings/conf_to_src.c
@@ -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 */
 
 #include "strings_def.h"
 #include <m_ctype.h>
@@ -285,7 +285,7 @@ fprint_copyright(FILE *file)
 "\n"
 "   You should have received a copy of the GNU General Public License\n"
 "   along with this program; if not, write to the Free Software\n"
-"   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */\n"
+"   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA */\n"
 "\n");
 }
 
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index d6a9695afbf..792c5521cd4 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.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 */
 
 /*
  * This file is basicly usa7 character sets with some extra functions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index dfeb77d8d6b..114472b3f10 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* This file is for binary pseudo charset, created by bar@mysql.com */
 
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c
index 9bf206f1de7..2acd4cfebcd 100644
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.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 */
 
 /* This file is for cp932 charaset (Windows Japanese),
    and created based on ctype-sjis.c file  */
diff --git a/strings/ctype-czech.c b/strings/ctype-czech.c
index e3abebad91d..99673100c12 100644
--- a/strings/ctype-czech.c
+++ b/strings/ctype-czech.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 */
 
 /* File strings/ctype-czech.c for MySQL.
 
diff --git a/strings/ctype-euc_kr.c b/strings/ctype-euc_kr.c
index 38cfa429d88..4c549a6686a 100644
--- a/strings/ctype-euc_kr.c
+++ b/strings/ctype-euc_kr.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 */
 
 /* 
  * This file is for Korean EUC charset, and created by powerm90@tinc.co.kr.
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index 82c4bb5a4e8..fe699f8a334 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* This file is for Japanese EUC charset, and created based on
 ctype-ujis.c file.
diff --git a/strings/ctype-extra.c b/strings/ctype-extra.c
index c690b6d0c18..90c7ea15eba 100644
--- a/strings/ctype-extra.c
+++ b/strings/ctype-extra.c
@@ -20,7 +20,7 @@
 
    You should have 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 "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/ctype-gb2312.c b/strings/ctype-gb2312.c
index b0e275fe93d..5030360bc74 100644
--- a/strings/ctype-gb2312.c
+++ b/strings/ctype-gb2312.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 */
 
 /* This file is for Chinese EUC character sets (GB2312), and created by Miles Tsai (net-bull@126.com).
  */
diff --git a/strings/ctype-gbk.c b/strings/ctype-gbk.c
index 37b003f1899..602255e9aee 100644
--- a/strings/ctype-gbk.c
+++ b/strings/ctype-gbk.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 */
 
 /* This file is for Chinese character sets GBK, created by Wei He 
    (hewei@mail.ied.ac.cn)
diff --git a/strings/ctype-latin1.c b/strings/ctype-latin1.c
index 26c66d60071..37f43c6bce5 100644
--- a/strings/ctype-latin1.c
+++ b/strings/ctype-latin1.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 */
 
 #include "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index ad83cab3325..3f8556fb872 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.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 "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/ctype-mb.ic b/strings/ctype-mb.ic
index 6fc4d6e3db4..7e278ea386d 100644
--- a/strings/ctype-mb.ic
+++ b/strings/ctype-mb.ic
@@ -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
 */
 
 
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 825a653d02f..20c7f81dbf4 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.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 "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 629e1cd8309..f0f005685fe 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.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 */
 
 /* This file is for Shift JIS charset, and created by tommy@valley.ne.jp.
  */
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index 11cb184813b..84a44b28b45 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* 
    UCA (Unicode Collation Algorithm) support. 
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 0791b0b742c..754ec69ee9d 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* UCS2 support. Written by Alexander Barkov <bar@mysql.com> */
 
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 5f8088847b6..22fbf425602 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* This file is for Japanese EUC charset, and created by tommy@valley.ne.jp.
  */
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index e2e3d96386e..25fb081bbb2 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Library General Public
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 /* UTF8 according RFC 2279 */
 /* Written by Alexander Barkov <bar@udm.net> */
diff --git a/strings/ctype-win1250ch.c b/strings/ctype-win1250ch.c
index 8e3527f9ff1..0a6352b19af 100644
--- a/strings/ctype-win1250ch.c
+++ b/strings/ctype-win1250ch.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 */
 
 /*
    Shared, independent copyright: (C) 2001 Jan Pazdziora.
diff --git a/strings/ctype.c b/strings/ctype.c
index 4af60d16d29..d68010e0015 100644
--- a/strings/ctype.c
+++ b/strings/ctype.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 "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/decimal.c b/strings/decimal.c
index bbfb4e9dc8b..56d09e8f303 100644
--- a/strings/decimal.c
+++ b/strings/decimal.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 Street, Fifth Floor, Boston, MA  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 /*
 =======================================================================
diff --git a/strings/do_ctype.c b/strings/do_ctype.c
index 55e319a2295..e9430deee42 100644
--- a/strings/do_ctype.c
+++ b/strings/do_ctype.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 */
 
 /* Prints case-convert and sort-convert tabell on stdout. This is used to
    make _ctype.c easyer */
diff --git a/strings/dtoa.c b/strings/dtoa.c
index 3dba0da7485..d11c5e346c5 100644
--- a/strings/dtoa.c
+++ b/strings/dtoa.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 */
 
 /****************************************************************
 
diff --git a/strings/dump_map.c b/strings/dump_map.c
index debc44d6f5f..fa713920e7b 100644
--- a/strings/dump_map.c
+++ b/strings/dump_map.c
@@ -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 */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/strings/my_strchr.c b/strings/my_strchr.c
index 0305ef89542..3ff7c32f482 100644
--- a/strings/my_strchr.c
+++ b/strings/my_strchr.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 "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c
index 134fdfc57b8..c31ae91921d 100644
--- a/strings/my_vsnprintf.c
+++ b/strings/my_vsnprintf.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 "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/strcoll.ic b/strings/strcoll.ic
index 4bced593a23..b0556cfac43 100644
--- a/strings/strcoll.ic
+++ b/strings/strcoll.ic
@@ -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
 */
 
 
diff --git a/strings/strmake.c b/strings/strmake.c
index 951a589e360..a5e1dafb185 100644
--- a/strings/strmake.c
+++ b/strings/strmake.c
@@ -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 */
 
 /*  File   : strmake.c
     Author : Michael Widenius
diff --git a/strings/t_ctype.h b/strings/t_ctype.h
index a4fdd267c3f..a6d2783fe93 100644
--- a/strings/t_ctype.h
+++ b/strings/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/strings/uca-dump.c b/strings/uca-dump.c
index 5d183608826..837dd7f3c30 100644
--- a/strings/uca-dump.c
+++ b/strings/uca-dump.c
@@ -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 */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/strings/uctypedump.c b/strings/uctypedump.c
index ed3c64969d5..30ae33afee1 100644
--- a/strings/uctypedump.c
+++ b/strings/uctypedump.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 "strings_def.h"
 #include <m_ctype.h>
diff --git a/strings/utr11-dump.c b/strings/utr11-dump.c
index 0806b3ba0cd..695f6b20047 100644
--- a/strings/utr11-dump.c
+++ b/strings/utr11-dump.c
@@ -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 */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/strings/xml.c b/strings/xml.c
index b5fed6a6760..0178ea2574e 100644
--- a/strings/xml.c
+++ b/strings/xml.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 Street, Fifth Floor, Boston, MA  02110-1301, USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
 
 #include "strings_def.h"
 #include "m_string.h"