merge with 3.23.53

New fix for pthread_mutex_trylock for HPUX 10.20


BitKeeper/deleted/.del-mysql.dsp:
  Delete: VC++Files/mysql.dsp
BitKeeper/deleted/.del-mysqlshow.dsp:
  Delete: VC++Files/client/mysqlshow.dsp
BitKeeper/deleted/.del-dbug.dsp:
  Delete: VC++Files/dbug/dbug.dsp
BitKeeper/deleted/.del-dbug.dsw:
  Delete: VC++Files/dbug/dbug.dsw
BitKeeper/deleted/.del-heap.dsp:
  Delete: VC++Files/heap/heap.dsp
BitKeeper/deleted/.del-innobase.dsp:
  Delete: VC++Files/innobase/innobase.dsp
BitKeeper/deleted/.del-isam.dsp:
  Delete: VC++Files/isam/isam.dsp
BitKeeper/deleted/.del-isam.dsw:
  Delete: VC++Files/isam/isam.dsw
BitKeeper/deleted/.del-isamchk.dsp:
  Delete: VC++Files/isamchk/isamchk.dsp
BitKeeper/deleted/.del-libmySQL.dsp:
  Delete: VC++Files/libmysql/libmySQL.dsp
BitKeeper/deleted/.del-libmysql.dsw:
  Delete: VC++Files/libmysql/libmysql.dsw
BitKeeper/deleted/.del-mysql.dsw:
  Delete: VC++Files/mysql.dsw
BitKeeper/deleted/.del-myTest.dsp:
  Delete: VC++Files/libmysqltest/myTest.dsp
BitKeeper/deleted/.del-mytest.dsw:
  Delete: VC++Files/libmysqltest/mytest.dsw
BitKeeper/deleted/.del-merge.dsp:
  Delete: VC++Files/merge/merge.dsp
BitKeeper/deleted/.del-merge.dsw:
  Delete: VC++Files/merge/merge.dsw
BitKeeper/deleted/.del-myisam.dsp:
  Delete: VC++Files/myisam/myisam.dsp
BitKeeper/deleted/.del-myisamchk.dsp:
  Delete: VC++Files/myisamchk/myisamchk.dsp
BitKeeper/deleted/.del-myisamlog.dsp:
  Delete: VC++Files/myisamlog/myisamlog.dsp
BitKeeper/deleted/.del-myisammrg.dsp:
  Delete: VC++Files/myisammrg/myisammrg.dsp
BitKeeper/deleted/.del-myisampack.dsp:
  Delete: VC++Files/myisampack/myisampack.dsp
BitKeeper/deleted/.del-mysqlbinlog.dsp:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp
BitKeeper/deleted/.del-bdb.dsp:
  Delete: VC++Files/bdb/bdb.dsp
BitKeeper/deleted/.del-MySqlManager.dsp:
  Delete: VC++Files/mysqlmanager/MySqlManager.dsp
BitKeeper/deleted/.del-mysqlmanager.dsw:
  Delete: VC++Files/mysqlmanager/mysqlmanager.dsw
BitKeeper/deleted/.del-myshutdown.dsp:
  Delete: VC++Files/mysqlshutdown/myshutdown.dsp
BitKeeper/deleted/.del-mysqlshutdown.dsp:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.dsp
BitKeeper/deleted/.del-mysqlwatch.dsp:
  Delete: VC++Files/mysqlwatch/mysqlwatch.dsp
BitKeeper/deleted/.del-mysys.dsp:
  Delete: VC++Files/mysys/mysys.dsp
BitKeeper/deleted/.del-mysys.dsw:
  Delete: VC++Files/mysys/mysys.dsw
BitKeeper/deleted/.del-pack_isam.dsp:
  Delete: VC++Files/pack_isam/pack_isam.dsp
BitKeeper/deleted/.del-perror.dsp:
  Delete: VC++Files/perror/perror.dsp
BitKeeper/deleted/.del-regex.dsp:
  Delete: VC++Files/regex/regex.dsp
BitKeeper/deleted/.del-mysql.dsp~1:
  Delete: VC++Files/client/mysql.dsp
BitKeeper/deleted/.del-regex.dsw:
  Delete: VC++Files/regex/regex.dsw
BitKeeper/deleted/.del-replace.dsp:
  Delete: VC++Files/replace/replace.dsp
BitKeeper/deleted/.del-mysqld.dsp:
  Delete: VC++Files/sql/mysqld.dsp
BitKeeper/deleted/.del-mysqldmax.dsp:
  Delete: VC++Files/sql/mysqldmax.dsp
BitKeeper/deleted/.del-strings.dsp:
  Delete: VC++Files/strings/noMASM/strings.dsp
BitKeeper/deleted/.del-test1.dsp:
  Delete: VC++Files/test1/test1.dsp
BitKeeper/deleted/.del-thr_insert_test.dsp:
  Delete: VC++Files/thr_insert_test/thr_insert_test.dsp
BitKeeper/deleted/.del-thr_test.dsp:
  Delete: VC++Files/thr_test/thr_test.dsp
BitKeeper/deleted/.del-zlib.dsp~1:
  Delete: VC++Files/zlib/zlib.dsp
BitKeeper/deleted/.del-mysqladmin.dsp:
  Delete: VC++Files/client/mysqladmin.dsp
BitKeeper/deleted/.del-mysqlclient.dsp:
  Delete: VC++Files/client/mysqlclient.dsp
BitKeeper/deleted/.del-mysqlclient.dsw:
  Delete: VC++Files/client/mysqlclient.dsw
BitKeeper/deleted/.del-mysqldump.dsp:
  Delete: VC++Files/client/mysqldump.dsp
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
BitKeeper/deleted/.del-mysqlimport.dsp:
  Delete: VC++Files/client/mysqlimport.dsp
Docs/manual.texi:
  Auto merged
configure.in:
  merge
mysys/my_pthread.c:
  New fix for pthread_mutex_trylock for HPUX
sql-bench/Makefile.am:
  merge with 3.23.53

4 files changed, 331 insertions, 0 deletions

diff --git a/VC++Files/strings/MASM6x/strings.dsp b/VC++Files/strings/MASM6x/strings.dsp
new file mode 100644
index 00000000000..0c1a3bdc0c2
--- /dev/null
+++ b/VC++Files/strings/MASM6x/strings.dsp
@@ -0,0 +1,244 @@
+# Microsoft Developer Studio Project File - Name="strings" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=strings - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "strings.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "strings.mak" CFG="strings - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "strings - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "strings - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "strings - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "release"
+# PROP Intermediate_Dir "release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_release\strings.lib"
+
+!ELSEIF  "$(CFG)" == "strings - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "debug"
+# PROP Intermediate_Dir "debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "strings - Win32 Release"
+# Name "strings - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\atof.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bchange.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bcmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bfill.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\bmove512.c
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-big5.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-czech.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-euc_kr.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-gb2312.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-gbk.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-sjis.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-tis620.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-ujis.c"
+# End Source File
+# Begin Source File
+
+SOURCE=.\ctype.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\int2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\llstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\longlong2str.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\r_strinstr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\str2int.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\Strings.asm
+
+!IF  "$(CFG)" == "strings - Win32 Release"
+
+# Begin Custom Build
+OutDir=.\release
+InputPath=.\Strings.asm
+InputName=Strings
+
+"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "strings - Win32 Debug"
+
+# Begin Custom Build
+OutDir=.\debug
+InputPath=.\Strings.asm
+InputName=Strings
+
+"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoul.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strtoull.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\Strxmov.asm
+
+!IF  "$(CFG)" == "strings - Win32 Release"
+
+# Begin Custom Build
+OutDir=.\release
+InputPath=.\Strxmov.asm
+InputName=Strxmov
+
+"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "strings - Win32 Debug"
+
+# Begin Custom Build
+OutDir=.\debug
+InputPath=.\Strxmov.asm
+InputName=Strxmov
+
+"$(OutDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	ml /Cx /nologo /DDOS386 /DM_I386 /Zm /coff /c /Fo $(Outdir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\strxnmov.c
+# End Source File
+# End Target
+# End Project
diff --git a/VC++Files/strings/MASM6x/strings.dsw b/VC++Files/strings/MASM6x/strings.dsw
new file mode 100644
index 00000000000..e3777b8e7d5
--- /dev/null
+++ b/VC++Files/strings/MASM6x/strings.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "strings"=".\strings.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/VC++Files/strings/noMASM/strings.dsw b/VC++Files/strings/noMASM/strings.dsw
new file mode 100644
index 00000000000..e3777b8e7d5
--- /dev/null
+++ b/VC++Files/strings/noMASM/strings.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "strings"=".\strings.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/VC++Files/strings/strings.dsw b/VC++Files/strings/strings.dsw
new file mode 100644
index 00000000000..e3777b8e7d5
--- /dev/null
+++ b/VC++Files/strings/strings.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "strings"=".\strings.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+