Proposed fix for bug #3818 (libmysqld.dll leads to program's crash)

configurations added to build the libraries with USE_TLS flag to be
used for libmysqld


VC++Files/dbug/dbug.dsp:
  TLS_DEBUG configuration added
VC++Files/heap/heap.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/isam/isam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/libmysql/libmysql.dsp:
  MYSQL_CLIENT define enabled
VC++Files/libmysqld/libmysqld.dsp:
  using of _tls libraries added
VC++Files/myisam/myisam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/myisammrg/myisammrg.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/mysys/mysys.dsp:
  TLS and TLS_DEBUG configurations added
include/mysql_com.h:
  __declspec(dllimport) seems to be necessary when one uses .dll
  on Windows

1 files changed, 69 insertions, 0 deletions

diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp
index 27efafd8f12..c021adb8d9c 100644
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -20,6 +20,8 @@ CFG=mysys - Win32 Debug
 !MESSAGE "mysys - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "mysys - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "mysys - Win32 Max" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysys - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE "mysys - Win32 TLS" (based on "Win32 (x86) Static Library")
 !MESSAGE
 
 # Begin Project
@@ -102,6 +104,56 @@ LIB32=xilink6.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib_release\mysys.lib"
 # ADD LIB32 /nologo /out:"..\lib_release\mysys-max.lib"
 
+!ELSEIF  "$(CFG)" == "mysys - Win32 TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mysys___Win32_TLS_DEBUG"
+# PROP BASE Intermediate_Dir "mysys___Win32_TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "mysys___Win32_TLS_DEBUG"
+# PROP Intermediate_Dir "mysys___Win32_TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
+# SUBTRACT BASE CPP /Fr
+# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_SYMDIR" /D "USE_TLS" /FD /c
+# SUBTRACT CPP /Fr
+# 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 /out:"..\lib_debug\mysys_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_debug\mysys_tls.lib"
+
+!ELSEIF  "$(CFG)" == "mysys - Win32 TLS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mysys___Win32_TLS"
+# PROP BASE Intermediate_Dir "mysys___Win32_TLS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "mysys___Win32_TLS"
+# PROP Intermediate_Dir "mysys___Win32_TLS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /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 /out:"..\lib_release\mysys_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\mysys_tls.lib"
+
 !ENDIF
 
 # Begin Target
@@ -109,6 +161,8 @@ LIB32=xilink6.exe -lib
 # Name "mysys - Win32 Release"
 # Name "mysys - Win32 Debug"
 # Name "mysys - Win32 Max"
+# Name "mysys - Win32 TLS_DEBUG"
+# Name "mysys - Win32 TLS"
 # Begin Source File
 
 SOURCE=.\array.c
@@ -121,6 +175,14 @@ SOURCE=.\array.c
 
 !ELSEIF  "$(CFG)" == "mysys - Win32 Max"
 
+
+!ELSEIF  "$(CFG)" == "mysys - Win32 TLS_DEBUG"
+
+# ADD BASE CPP /FR
+# ADD CPP /FR
+
+!ELSEIF  "$(CFG)" == "mysys - Win32 TLS"
+
 !ENDIF
 
 # End Source File
@@ -504,6 +566,13 @@ SOURCE=.\thr_lock.c
 
 !ELSEIF  "$(CFG)" == "mysys - Win32 Max"
 
+!ELSEIF  "$(CFG)" == "mysys - Win32 TLS_DEBUG"
+
+# ADD BASE CPP /D "EXTRA_DEBUG"
+# ADD CPP /D "EXTRA_DEBUG"
+
+!ELSEIF  "$(CFG)" == "mysys - Win32 TLS"
+
 !ENDIF
 
 # End Source File