Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 (84fbc276) · Commits · Software / OSDI20 Artifacts / mariadb

VC++Files/dbug/dbug.dsp

+27 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ CFG=dbug - Win32 Debug
		!MESSAGE
		!MESSAGE "dbug - Win32 Release" (based on "Win32 (x86) Static Library")
		!MESSAGE "dbug - Win32 Debug" (based on "Win32 (x86) Static Library")
		!MESSAGE "dbug - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library")
		!MESSAGE

		# Begin Project
		@@ -76,12 +77,38 @@ LIB32=xilink6.exe -lib
		# ADD BASE LIB32 /nologo
		# ADD LIB32 /nologo /out:"..\lib_debug\dbug.lib"

		!ELSEIF "$(CFG)" == "dbug - Win32 TLS_DEBUG"

		# PROP BASE Use_MFC 0
		# PROP BASE Use_Debug_Libraries 1
		# PROP BASE Output_Dir "dbug___Win32_TLS_DEBUG"
		# PROP BASE Intermediate_Dir "dbug___Win32_TLS_DEBUG"
		# PROP BASE Target_Dir ""
		# PROP Use_MFC 0
		# PROP Use_Debug_Libraries 1
		# PROP Output_Dir "dbug___Win32_TLS_DEBUG"
		# PROP Intermediate_Dir "dbug___Win32_TLS_DEBUG"
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../include" /D "__WIN32__" /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 "__WIN32__" /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\dbug_tls.lib"
		# ADD LIB32 /nologo /out:"..\lib_debug\dbug_tls.lib"

		!ENDIF

		# Begin Target

		# Name "dbug - Win32 Release"
		# Name "dbug - Win32 Debug"
		# Name "dbug - Win32 TLS_DEBUG"
		# Begin Source File

		SOURCE=.\dbug.c

VC++Files/heap/heap.dsp

+61 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ CFG=heap - Win32 Debug
		!MESSAGE
		!MESSAGE "heap - Win32 Release" (based on "Win32 (x86) Static Library")
		!MESSAGE "heap - Win32 Debug" (based on "Win32 (x86) Static Library")
		!MESSAGE "heap - Win32 TLS_DEBUG" (based on "Win32 (x86) Static Library")
		!MESSAGE "heap - 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\heap.lib"

		!ELSEIF "$(CFG)" == "heap - Win32 TLS_DEBUG"

		# PROP BASE Use_MFC 0
		# PROP BASE Use_Debug_Libraries 1
		# PROP BASE Output_Dir "heap___Win32_TLS_DEBUG"
		# PROP BASE Intermediate_Dir "heap___Win32_TLS_DEBUG"
		# PROP BASE Target_Dir ""
		# PROP Use_MFC 0
		# PROP Use_Debug_Libraries 1
		# PROP Output_Dir "heap___Win32_TLS_DEBUG"
		# PROP Intermediate_Dir "heap___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\heap_tls.lib"
		# ADD LIB32 /nologo /out:"..\lib_debug\heap_tls.lib"

		!ELSEIF "$(CFG)" == "heap - Win32 TLS"

		# PROP BASE Use_MFC 0
		# PROP BASE Use_Debug_Libraries 0
		# PROP BASE Output_Dir "heap___Win32_TLS"
		# PROP BASE Intermediate_Dir "heap___Win32_TLS"
		# PROP BASE Target_Dir ""
		# PROP Use_MFC 0
		# PROP Use_Debug_Libraries 0
		# PROP Output_Dir "heap___Win32_TLS"
		# PROP Intermediate_Dir "heap___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\heap_tls.lib"
		# ADD LIB32 /nologo /out:"..\lib_release\heap_tls.lib"

		!ENDIF

		# Begin Target

		# Name "heap - Win32 Release"
		# Name "heap - Win32 Debug"
		# Name "heap - Win32 TLS_DEBUG"
		# Name "heap - Win32 TLS"
		# Begin Source File

		SOURCE=.\_check.c
		@@ -128,6 +182,13 @@ SOURCE=.\hp_hash.c

		# SUBTRACT CPP /YX

		!ELSEIF "$(CFG)" == "heap - Win32 TLS_DEBUG"

		# SUBTRACT BASE CPP /YX
		# SUBTRACT CPP /YX

		!ELSEIF "$(CFG)" == "heap - Win32 TLS"

		!ENDIF

		# End Source File

VC++Files/isam/isam.dsp

+54 −0

Original line number	Diff line number	Diff line
		@@ -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

VC++Files/libmysql/libmysql.dsp

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ RSC=rc.exe
		# PROP Ignore_Export_Lib 0
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "." /I "..\include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "NDEBUG" /FD /c
		# ADD CPP /nologo /G6 /MT /W3 /O2 /I "." /I "..\include" /I "../zlib" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "NDEBUG" /D "MYSQL_CLIENT" /FD /c
		# SUBTRACT CPP /YX
		# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
		# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
		@@ -76,7 +76,7 @@ PostBuild_Cmds=xcopy release\libmysql.lib ..\lib_release /y
		# PROP Ignore_Export_Lib 0
		# PROP Target_Dir ""
		# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
		# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "." /I "..\include" /I "../zlib" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /FD /c
		# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "." /I "..\include" /I "../zlib" /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /FD /c
		# SUBTRACT CPP /YX
		# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
		# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

VC++Files/libmysqld/libmysqld.dsp

+6 −6

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ BSC32=bscmake.exe
		# ADD BSC32 /nologo
		LINK32=xilink6.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# SUBTRACT LINK32 /pdb:none

		!ELSEIF "$(CFG)" == "libmysqld - Win32 Debug"
		@@ -82,7 +82,7 @@ BSC32=bscmake.exe
		# ADD BSC32 /nologo
		LINK32=xilink6.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\innodb.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" /pdbtype:sept
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug_tls.lib ..\lib_debug\mysys_tls.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap_tls.lib ..\lib_debug\innodb.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib" /pdbtype:sept
		# SUBTRACT LINK32 /pdb:none

		!ELSEIF "$(CFG)" == "libmysqld - Win32 classic"
		@@ -109,9 +109,9 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=xilink6.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_release/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# SUBTRACT BASE LINK32 /pdb:none
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# SUBTRACT LINK32 /pdb:none

		!ELSEIF "$(CFG)" == "libmysqld - Win32 pro"
		@@ -138,9 +138,9 @@ BSC32=bscmake.exe
		# ADD BASE BSC32 /nologo
		# ADD BSC32 /nologo
		LINK32=xilink6.exe
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_classic/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# SUBTRACT BASE LINK32 /pdb:none
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_pro/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\myisam_tls.lib ..\lib_release\myisammrg_tls.lib ..\lib_release\mysys_tls.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap_tls.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /dll /machine:I386 /out:"../lib_pro/libmysqld.dll" /implib:"../lib_release/libmysqld.lib"
		# SUBTRACT LINK32 /pdb:none

		!ENDIF