diff options
| author | unknown <hf@deer.(none)> | 2004-05-26 00:27:00 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-05-26 00:27:00 +0500 |
| commit | 19a78ceac8e0d70db3178930f67f0a0f8b7cb46d (patch) | |
| tree | b77ab2a0ca48a92945aa966cc1b2830e27e1542d /VC++Files/isam | |
| parent | b7e8f418c25d087db79a925d41718abfd1073b45 (diff) | |
| download | mariadb-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/isam')
| -rw-r--r-- | VC++Files/isam/isam.dsp | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/VC++Files/isam/isam.dsp b/VC++Files/isam/isam.dsp index 3e1dcf9dc35..759a1b6ee03 100644 --- a/VC++Files/isam/isam.dsp +++ b/VC++Files/isam/isam.dsp @@ -19,6 +19,8 @@ CFG=isam - Win32 Debug !MESSAGE !MESSAGE "isam - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "isam - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "isam - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library") +!MESSAGE "isam - Win32 TLS" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -76,12 +78,64 @@ LIB32=xilink6.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib_Debug\isam.lib" +!ELSEIF "$(CFG)" == "isam - Win32 TLS_DEBUG" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "isam___Win32_TLS_DEBUG" +# PROP BASE Intermediate_Dir "isam___Win32_TLS_DEBUG" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "isam___Win32_TLS_DEBUG" +# PROP Intermediate_Dir "isam___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" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /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_Debug\isam_tls.lib" +# ADD LIB32 /nologo /out:"..\lib_Debug\isam_tls.lib" + +!ELSEIF "$(CFG)" == "isam - Win32 TLS" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "isam___Win32_TLS" +# PROP BASE Intermediate_Dir "isam___Win32_TLS" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "isam___Win32_TLS" +# PROP Intermediate_Dir "isam___Win32_TLS" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_WINDOWS" /D "NDEBUG" /FD /c +# SUBTRACT BASE CPP /YX +# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /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\isam_tls.lib" +# ADD LIB32 /nologo /out:"..\lib_release\isam_tls.lib" + !ENDIF # Begin Target # Name "isam - Win32 Release" # Name "isam - Win32 Debug" +# Name "isam - Win32 TLS_DEBUG" +# Name "isam - Win32 TLS" # Begin Source File SOURCE=.\_cache.c |