diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
commit | 005c7e54214546584c8dc67a746e215f8dbe4b58 (patch) | |
tree | dea50cd7b32808413e058d43d20cf230d1cc7477 /strings | |
parent | b9f220b45afaae9b61af29129a8c8ec5f9a7759b (diff) | |
parent | 4f5c10e6b565bc2761b9d083e25c6a36141552a0 (diff) | |
download | mariadb-git-005c7e54214546584c8dc67a746e215f8dbe4b58.tar.gz |
mysql-5.5.32 merge
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-bin.c | 4 | ||||
-rw-r--r-- | strings/ctype-eucjpms.c | 4 | ||||
-rw-r--r-- | strings/ctype-ujis.c | 4 | ||||
-rw-r--r-- | strings/decimal.c | 2 | ||||
-rw-r--r-- | strings/t_ctype.h | 2 | ||||
-rw-r--r-- | strings/xml.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 88a7f8b84e8..07cf9d45f07 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -13,8 +13,8 @@ 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., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA */ /* This file is for binary pseudo charset, created by bar@mysql.com */ diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c index 9ad64ca2457..fe6bb744706 100644 --- a/strings/ctype-eucjpms.c +++ b/strings/ctype-eucjpms.c @@ -13,8 +13,8 @@ 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., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA */ /* This file is for Japanese EUC charset, and created based on ctype-ujis.c file. diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c index ecb0992c70d..2743efc4087 100644 --- a/strings/ctype-ujis.c +++ b/strings/ctype-ujis.c @@ -14,8 +14,8 @@ 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., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301, USA */ /* This file is for Japanese EUC charset, and created by tommy@valley.ne.jp. */ diff --git a/strings/decimal.c b/strings/decimal.c index c3cef4e3d50..b36025ee8fc 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* ======================================================================= diff --git a/strings/t_ctype.h b/strings/t_ctype.h index af4f3ebbaa1..8198d3eada8 100644 --- a/strings/t_ctype.h +++ b/strings/t_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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ /* Copyright (C) 1998, 1999 by Pruet Boonma, all rights reserved. diff --git a/strings/xml.c b/strings/xml.c index 54ff7a26c16..3b2c278f553 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include "strings_def.h" #include "my_xml.h" |