Merge branch '5.5' into 10.1

20 files changed, 20 insertions, 20 deletions

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 40df176c6e6..0dc9fc5738a 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -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_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
diff --git a/client/client_priv.h b/client/client_priv.h
index 1419d9dfad9..1668227cc96 100644
--- a/client/client_priv.h
+++ b/client/client_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
 */
 
 /* Common defines for all clients */
diff --git a/client/completion_hash.cc b/client/completion_hash.cc
index c170b69de2d..553d0a1f926 100644
--- a/client/completion_hash.cc
+++ b/client/completion_hash.cc
@@ -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 */
 
 /* Quick & light hash implementation for tab completion purposes
  *
diff --git a/client/completion_hash.h b/client/completion_hash.h
index 70c2cf1b371..57483e0f8b8 100644
--- a/client/completion_hash.h
+++ b/client/completion_hash.h
@@ -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 Street, Fifth Floor, Boston,
-   MA 02110-1301, USA */
+   MA 02110-1335  USA */
 
 #ifndef _HASH_
 #define _HASH_
diff --git a/client/echo.c b/client/echo.c
index 2a3cb915d23..90a538faf62 100644
--- a/client/echo.c
+++ b/client/echo.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 */
 
 /*
   echo is a replacement for the "echo" command builtin to cmd.exe
diff --git a/client/get_password.c b/client/get_password.c
index 8a507d94e9b..04c5537fc35 100644
--- a/client/get_password.c
+++ b/client/get_password.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 */
 
 /*
 ** Ask for a password from tty
diff --git a/client/my_readline.h b/client/my_readline.h
index 57537308fed..ec43d81f2c0 100644
--- a/client/my_readline.h
+++ b/client/my_readline.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
 */
 
 /* readline for batch mode */
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c
index c353fb039d6..682a2365a92 100644
--- a/client/mysql_plugin.c
+++ b/client/mysql_plugin.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 <my_global.h>
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index 5eb495774ce..d18dc97c9b8 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.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 "client_priv.h"
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
index d4d40b0a0f2..03a10bfa5b9 100644
--- a/client/mysqladmin.cc
+++ b/client/mysqladmin.cc
@@ -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 */
 
 /* maintaince of mysql databases */
 
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 4ba76cb3ba1..11dc98943dd 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -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/client/mysqlcheck.c b/client/mysqlcheck.c
index eafd47132ad..5e4e22b67d6 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.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
 */
 
 /* By Jani Tolonen, 2001-04-20, MySQL Development Team */
diff --git a/client/mysqldump.c b/client/mysqldump.c
index f00d1188502..44f9849306f 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.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 Street, Fifth Floor, Boston, MA  02110-1301, USA
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA
 */
 
 /* mysqldump.c  - Dump a tables contents and format to an ASCII file
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index a9c24e20b0a..38cec6da668 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.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/client/mysqlshow.c b/client/mysqlshow.c
index 95ee8d697f3..8246d4364c9 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.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
 */
 
 /* Show databases, tables or columns */
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index fd30776446d..5dca3fae2cb 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.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/client/mysqltest.cc b/client/mysqltest.cc
index cc1d61e5d79..051e7fbef02 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -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 */
 
 /*
   mysqltest
diff --git a/client/readline.cc b/client/readline.cc
index 23b1f8d7ac7..12df8b312ad 100644
--- a/client/readline.cc
+++ b/client/readline.cc
@@ -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
 */
 
 /* readline for batch mode */
diff --git a/client/sql_string.cc.dontuse b/client/sql_string.cc.dontuse
index 65b14e36cd1..72736ef5511 100644
--- a/client/sql_string.cc.dontuse
+++ b/client/sql_string.cc.dontuse
@@ -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 originally from the mysql distribution. Coded by monty */
diff --git a/client/sql_string.h.dontuse b/client/sql_string.h.dontuse
index 94f844dc689..e5bf8e0b67c 100644
--- a/client/sql_string.h.dontuse
+++ b/client/sql_string.h.dontuse
@@ -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 file is originally from the mysql distribution. Coded by monty */