merge to 3.23.51

Docs/glibc-2.2.5.patch:
  Auto merged
strings/longlong2str-x86.s:
  Auto merged
strings/strings-x86.s:
  Auto merged

Docs/glibc-2.2.5.patch

@@ -52,7 +52,7 @@ diff -r -c --exclude=*.info* glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nssw
         while (isspace (line[0]))
   	++line;
 ***************
-*** 510,522 ****
+522
         if (name == line)
   	return result;
   
@@ -86,7 +86,7 @@ diff -r -c --exclude=*.info* glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nssw
         if (new_service == NULL)
   	return result;
   
-!       *((char *) __mempcpy (new_service->name, name, name_alloc_len)) = '\0';
+!       *((char *) __mempcpy (new_service->name, name, name_alloc_len-1)) = '\0';
   
         /* Set default actions.  */
         new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;

Makefile.am

@@ -24,7 +24,7 @@ EXTRA_DIST =		INSTALL-SOURCE README \
 SUBDIRS =		include @docs_dirs@ @readline_dir@ \
 			@thread_dirs@ pstack @sql_client_dirs@ \
 			@sql_server_dirs@ @libmysqld_dirs@ scripts man \
-			tests BUILD \
+			tests BUILD os2 \
 			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 
 # Relink after clean

configure.in

@@ -2364,7 +2364,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
  myisam/Makefile myisammrg/Makefile \
  man/Makefile BUILD/Makefile readline/Makefile vio/Makefile \
  libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \
- libmysql/Makefile client/Makefile \
+ libmysql/Makefile client/Makefile os2/Makefile \
  pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile \
  merge/Makefile dbug/Makefile scripts/Makefile \
  include/Makefile sql-bench/Makefile tools/Makefile \

os2/Makefile.am

+# Copyright (C) 2002 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# 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
+
+## Process this file with automake to create Makefile.in
+
+EXTRA_DIST = BldLevel.cmd BldLevel.rc BldLevelInf.cmd ChangeLog.os2 \
+							MySQL-All.icc MySQL-Client.icc MySQL-Client.irs \
+							MySQL-Lib.icc MySQL-Opt.icc MySQL-ReadLine.icc \
+							MySQL-Source.icc MySQL-Sql.icc MySQL-Util.icc MySQL-Util.irs \
+							MySQL-binlog.icc MySQL-binlog.irs MySQL-sql.irs ReadMe.txt \
+							build-all.cmd build-all.log mysql-inf.wis mysql.base \
+							mysql.ih mysql.wis mysqlalt.wis readme.os2 rint.cmd rint.obj \
+							rint.s
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%