Applied fixes to issues discovered during test builds on Windows.

VC++Files/libmysql/libmysql.dsp:
  strtod.c is needed to build the library.
VC++Files/libmysqld/libmysqld.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqldemb/mysqldemb.dsp:
  Add include directory to resolve problem with including emb_qcache.h,
  remove opt_ft.cc (no longer in tree).
VC++Files/mysqlserver/mysqlserver.dsp:
  Add include directory to resolve problem with including emb_qcache.h.
VC++Files/strings/MASM6x/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/noMASM/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
VC++Files/strings/strings.dsp:
  Remove atof.c (no longer in tree) and add strtod.c, 
  needed for the library.
sql/mysqld.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
sql/set_var.cc:
  A cast is required to resolve the compile error on Windows (char * is 
  not equivalent to byte *).
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

3 files changed, 51 insertions, 35 deletions

diff --git a/VC++Files/strings/MASM6x/strings.dsp b/VC++Files/strings/MASM6x/strings.dsp
index 1f54910bf58..1c5ce5249f5 100644
--- a/VC++Files/strings/MASM6x/strings.dsp
+++ b/VC++Files/strings/MASM6x/strings.dsp
@@ -84,10 +84,6 @@ LIB32=link.exe -lib
 # 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
@@ -191,6 +187,10 @@ InputName=Strings
 # End Source File
 # Begin Source File
 
+SOURCE=.\strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\strtol.c
 # End Source File
 # Begin Source File
diff --git a/VC++Files/strings/noMASM/strings.dsp b/VC++Files/strings/noMASM/strings.dsp
index 6e2dbb3c013..ffec20f3a59 100644
--- a/VC++Files/strings/noMASM/strings.dsp
+++ b/VC++Files/strings/noMASM/strings.dsp
@@ -25,7 +25,7 @@ CFG=strings - Win32 Debug
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "strings - Win32 Release"
@@ -48,7 +48,7 @@ RSC=rc.exe
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_release\strings.lib"
 
@@ -65,14 +65,14 @@ LIB32=link.exe -lib
 # 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 "_WINDOWS" /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
+LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib_debug\strings.lib"
 
@@ -84,10 +84,6 @@ LIB32=link.exe -lib
 # 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
@@ -100,10 +96,6 @@ SOURCE=.\bfill.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\bmove.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\bmove512.c
 # End Source File
 # Begin Source File
@@ -116,6 +108,10 @@ SOURCE=".\ctype-big5.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-bin.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-czech.c"
 # End Source File
 # Begin Source File
@@ -124,6 +120,10 @@ SOURCE=".\ctype-euc_kr.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-extra.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-gb2312.c"
 # End Source File
 # Begin Source File
@@ -132,7 +132,15 @@ SOURCE=".\ctype-gbk.c"
 # End Source File
 # Begin Source File
 
-SOURCE=".\ctype-latin1_de.c"
+SOURCE=".\ctype-latin1.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-mb.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-simple.c"
 # End Source File
 # Begin Source File
 
@@ -144,10 +152,22 @@ SOURCE=".\ctype-tis620.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-ucs2.c"
+# End Source File
+# Begin Source File
+
 SOURCE=".\ctype-ujis.c"
 # End Source File
 # Begin Source File
 
+SOURCE=".\ctype-utf8.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\ctype-win1250ch.c"
+# End Source File
+# Begin Source File
+
 SOURCE=.\ctype.c
 # End Source File
 # Begin Source File
@@ -168,23 +188,23 @@ SOURCE=.\longlong2str.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\r_strinstr.c
+SOURCE=.\my_strtoll10.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\str2int.c
+SOURCE=.\my_vsnprintf.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strappend.c
+SOURCE=.\r_strinstr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strcend.c
+SOURCE=.\str2int.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strcont.c
+SOURCE=.\strcend.c
 # End Source File
 # Begin Source File
 
@@ -196,10 +216,6 @@ SOURCE=.\strfill.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strinstr.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\strmake.c
 # End Source File
 # Begin Source File
@@ -208,15 +224,11 @@ SOURCE=.\strmov.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strnlen.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\strnmov.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strstr.c
+SOURCE=.\strtod.c
 # End Source File
 # Begin Source File
 
@@ -242,5 +254,9 @@ SOURCE=.\strxmov.c
 
 SOURCE=.\strxnmov.c
 # End Source File
+# Begin Source File
+
+SOURCE=.\xml.c
+# End Source File
 # End Target
 # End Project
diff --git a/VC++Files/strings/strings.dsp b/VC++Files/strings/strings.dsp
index 030acdb7451..ffec20f3a59 100644
--- a/VC++Files/strings/strings.dsp
+++ b/VC++Files/strings/strings.dsp
@@ -84,10 +84,6 @@ LIB32=xilink6.exe -lib
 # 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
@@ -232,6 +228,10 @@ SOURCE=.\strnmov.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\strtod.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\strtol.c
 # End Source File
 # Begin Source File