Commit 6e8252a5 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/home/my/mysql-4.0


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 4eb67ce4 2d67f1e0

VC++Files/README.build-files

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Some notes about building MySQL with VC++



- After bulding all projects, you get the files in the following directories:



Directory		Content



lib_debug		Debug libraries

lib_release		Release libraries

lib_classic		Embedded server libraries for classic

lib_pro			Embedded server libraries for pro

client_debug		Debug executables

client_release		Client release

client_classic		Commerical binaries (classic)

client_pro		Commerical binaries (unique for pro version)

include			Include files



The copy_mysql_files.bat script can be used to copy the generated

files to c:\mysql

VC++Files/bdb/bdb.dsp

+6 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ CFG=bdb - Win32 Max 
# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

CPP=xicl6.exe

RSC=rc.exe



!IF  "$(CFG)" == "bdb - Win32 Debug"
@@ -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_debug\bdb.lib"
@@ -56,8 +56,8 @@ LIB32=link.exe -lib 


# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "bdb___Win32_Max"

# PROP BASE Intermediate_Dir "bdb___Win32_Max"

# PROP BASE Output_Dir "max"

# PROP BASE Intermediate_Dir "max"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1
@@ -66,13 +66,13 @@ LIB32=link.exe -lib 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../bdb/build_win32" /I "../bdb/include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c

# SUBTRACT BASE CPP /Fr

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb/include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /Fo"mysys___Win32_Max/" /Fd"mysys___Win32_Max/" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb/include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D MYSQL_SERVER_SUFFIX_MAX /Fo"max/" /Fd"max/" /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

LIB32=xilink6.exe -lib

# ADD BASE LIB32 /nologo /out:"..\lib_debug\bdb.lib"

# ADD LIB32 /nologo /out:"..\lib_release\bdb.lib"

VC++Files/client/mysql.dsp

+46 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ CFG=mysql - Win32 Debug 
!MESSAGE

!MESSAGE "mysql - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "mysql - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE "mysql - Win32 classic" (based on "Win32 (x86) Console Application")

!MESSAGE



# Begin Project
@@ -42,7 +43,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -79,15 +80,45 @@ 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 mysqlclient.lib wsock32.lib 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 /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysql.exe" /pdbtype:sept /libpath:"..\lib_debug\\"



!ELSEIF  "$(CFG)" == "mysql - Win32 classic"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "mysql___Win32_classic"

# PROP BASE Intermediate_Dir "mysql___Win32_classic"

# PROP BASE Ignore_Export_Lib 0

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "classic"

# PROP Intermediate_Dir "classic"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D "MYSQL_COMMERCIAL_LICENSE" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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 /subsystem:console /debug /machine:I386 /out:"../client_release/mysql.exe" /libpath:"..\lib_release\\"

# SUBTRACT BASE LINK32 /incremental:yes

# ADD LINK32 mysqlclient.lib wsock32.lib 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 /subsystem:console /debug /machine:I386 /out:"../client_classic/mysql.exe" /libpath:"..\lib_release\\"

# SUBTRACT LINK32 /incremental:yes



!ENDIF



# Begin Target



# Name "mysql - Win32 Release"

# Name "mysql - Win32 Debug"

# Name "mysql - Win32 classic"

# Begin Source File



SOURCE=..\mysys\my_gethostbyname.c

SOURCE=.\completion_hash.cpp

# End Source File

# Begin Source File
@@ -99,8 +130,21 @@ SOURCE=.\mysql.cpp 


!ELSEIF  "$(CFG)" == "mysql - Win32 Debug"



!ELSEIF  "$(CFG)" == "mysql - Win32 classic"



# ADD BASE CPP /Zi /O2

# ADD CPP /Zi /O2



!ENDIF



# End Source File

# Begin Source File



SOURCE=.\readline.cpp

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

# End Project

VC++Files/client/mysqladmin.dsp

+30 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ CFG=mysqladmin - Win32 Debug 
!MESSAGE

!MESSAGE "mysqladmin - Win32 Release" (based on "Win32 (x86) Console Application")

!MESSAGE "mysqladmin - Win32 Debug" (based on "Win32 (x86) Console Application")

!MESSAGE "mysqladmin - Win32 classic" (based on "Win32 (x86) Console Application")

!MESSAGE



# Begin Project
@@ -42,7 +43,7 @@ RSC=rc.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -78,12 +79,40 @@ 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 /subsystem:console /debug /machine:I386 /pdbtype:sept

# ADD LINK32 mysqlclient.lib wsock32.lib 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 /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqladmin.exe" /pdbtype:sept /libpath:"..\lib_debug\\"



!ELSEIF  "$(CFG)" == "mysqladmin - Win32 classic"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "mysqladmin___Win32_classic"

# PROP BASE Intermediate_Dir "mysqladmin___Win32_classic"

# PROP BASE Ignore_Export_Lib 0

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "classic"

# PROP Intermediate_Dir "classic"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG"  /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD  /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=xilink6.exe

# ADD BASE LINK32 mysqlclient.lib wsock32.lib 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 /subsystem:console /machine:I386 /out:"../client_release/mysqladmin.exe" /libpath:"..\lib_release\\"

# ADD LINK32 mysqlclient.lib wsock32.lib 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 /subsystem:console /machine:I386 /out:"../client_classic/mysqladmin.exe" /libpath:"..\lib_release\\"



!ENDIF



# Begin Target



# Name "mysqladmin - Win32 Release"

# Name "mysqladmin - Win32 Debug"

# Name "mysqladmin - Win32 classic"

# Begin Source File



SOURCE=.\mysqladmin.c

VC++Files/client/mysqlclient.dsp

+12 −32
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ CFG=mysqlclient - Win32 Debug 
# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

CPP=xicl6.exe

RSC=rc.exe



!IF  "$(CFG)" == "mysqlclient - Win32 Release"
@@ -41,14 +41,14 @@ RSC=rc.exe 
# PROP Intermediate_Dir "release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "NDEBUG" /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_release\mysqlclient.lib"
@@ -72,7 +72,7 @@ LIB32=link.exe -lib 
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\mysqlclient.lib"
@@ -104,14 +104,6 @@ SOURCE=..\mysys\charset.c 
# End Source File

# Begin Source File



SOURCE=.\completion_hash.cpp

# End Source File

# Begin Source File



SOURCE=.\completion_hash.h

# End Source File

# Begin Source File



SOURCE="..\strings\ctype-big5.c"

# End Source File

# Begin Source File
@@ -406,10 +398,6 @@ SOURCE=..\libmysql\password.c 
# End Source File

# Begin Source File



SOURCE=.\readline.cpp

# End Source File

# Begin Source File



SOURCE=..\mysys\safemalloc.c

# End Source File

# Begin Source File
@@ -418,14 +406,6 @@ SOURCE=.\select_test.c 
# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# Begin Source File



SOURCE=.\sql_string.h

# End Source File

# Begin Source File



SOURCE=..\strings\str2int.c

# End Source File

# Begin Source File