summaryrefslogtreecommitdiff
path: root/VC++Files/myisam
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-05-26 00:27:00 +0500
committerunknown <hf@deer.(none)>2004-05-26 00:27:00 +0500
commit19a78ceac8e0d70db3178930f67f0a0f8b7cb46d (patch)
treeb77ab2a0ca48a92945aa966cc1b2830e27e1542d /VC++Files/myisam
parentb7e8f418c25d087db79a925d41718abfd1073b45 (diff)
downloadmariadb-git-19a78ceac8e0d70db3178930f67f0a0f8b7cb46d.tar.gz
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
Diffstat (limited to 'VC++Files/myisam')
-rw-r--r--VC++Files/myisam/myisam.dsp50
1 files changed, 50 insertions, 0 deletions
diff --git a/VC++Files/myisam/myisam.dsp b/VC++Files/myisam/myisam.dsp
index e3c1f8cee7b..8e5900e6493 100644
--- a/VC++Files/myisam/myisam.dsp
+++ b/VC++Files/myisam/myisam.dsp
@@ -19,6 +19,8 @@ CFG=myisam - Win32 Debug
!MESSAGE
!MESSAGE "myisam - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "myisam - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisam - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library")
+!MESSAGE "myisam - Win32 TLS" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@@ -74,12 +76,60 @@ LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib_Debug\myisam.lib"
+!ELSEIF "$(CFG)" == "myisam - Win32 TLS_DEBUG"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "myisam___Win32_TLS_DEBUG"
+# PROP BASE Intermediate_Dir "myisam___Win32_TLS_DEBUG"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "myisam___Win32_TLS_DEBUG"
+# PROP Intermediate_Dir "myisam___Win32_TLS_DEBUG"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
+# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /Fo".\Debug/" /Fd".\Debug/" /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib_Debug\myisam_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_Debug\myisam_tls.lib"
+
+!ELSEIF "$(CFG)" == "myisam - Win32 TLS"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "myisam___Win32_TLS"
+# PROP BASE Intermediate_Dir "myisam___Win32_TLS"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "myisam___Win32_TLS"
+# PROP Intermediate_Dir "myisam___Win32_TLS"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c
+# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /D "USE_TLS" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib_release\myisam_tls.lib"
+# ADD LIB32 /nologo /out:"..\lib_release\myisam_tls.lib"
+
!ENDIF
# Begin Target
# Name "myisam - Win32 Release"
# Name "myisam - Win32 Debug"
+# Name "myisam - Win32 TLS_DEBUG"
+# Name "myisam - Win32 TLS"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"