Skip to content

M
mariadb
Commit af44187b authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

Merge with 4.0 to get fixes for Windows project files

parents f23af5e6 0babddff
Hide whitespace changes
Inline Side-by-side
Showing with 354 additions and 118 deletions
BUILD/compile-pentium-valgrind-max
View file @ af44187b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
path=`dirname $0` path=`dirname $0`
. "$path/SETUP.sh" . "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify" extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"
c_warnings="$c_warnings $debug_extra_warnings" c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs" extra_configs="$pentium_configs $debug_configs"
......
VC++Files/bdb/bdb.dsp
View file @ af44187b
...@@ -65,7 +65,7 @@ LIB32=xilink6.exe -lib ...@@ -65,7 +65,7 @@ LIB32=xilink6.exe -lib
# PROP Target_Dir "" # 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 # 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 # SUBTRACT BASE CPP /Fr
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D MYSQL_SERVER_SUFFIX_MAX /Fo"max/" /Fd"max/" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb" /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 BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
VC++Files/client/mysql.dsp
View file @ af44187b
...@@ -96,7 +96,7 @@ LINK32=xilink6.exe ...@@ -96,7 +96,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # 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 # 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 # 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 # ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
......
VC++Files/client/mysqladmin.dsp
View file @ af44187b
...@@ -95,7 +95,7 @@ LINK32=xilink6.exe ...@@ -95,7 +95,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # 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 # 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 # 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 # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
......
VC++Files/client/mysqldump.dsp
View file @ af44187b
...@@ -95,7 +95,7 @@ LINK32=xilink6.exe ...@@ -95,7 +95,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # 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 # 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 # 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 # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
......
VC++Files/client/mysqlimport.dsp
View file @ af44187b
...@@ -96,7 +96,7 @@ LINK32=xilink6.exe ...@@ -96,7 +96,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # 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 # 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 # 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 # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
......
VC++Files/client/mysqlshow.dsp
View file @ af44187b
...@@ -95,7 +95,7 @@ LINK32=xilink6.exe ...@@ -95,7 +95,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # 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 # 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 # 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 # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
......
VC++Files/copy_mysql_files.bat
View file @ af44187b
...@@ -2,12 +2,8 @@ REM stop any conflicting service ...@@ -2,12 +2,8 @@ REM stop any conflicting service
net stop mysql net stop mysql
REM Our build system uses M:\mysql-version for the build root dir REM Copy binaries to c:\mysql
REM (We assume we are in build root when executing this script)
M:
cd \mysql-4.0
REM Copy binaries
copy lib_debug\libmysql.* c:\mysql\lib\debug copy lib_debug\libmysql.* c:\mysql\lib\debug
copy lib_debug\zlib.* c:\mysql\lib\debug copy lib_debug\zlib.* c:\mysql\lib\debug
......
VC++Files/innobase/innobase.dsp
View file @ af44187b
...@@ -91,7 +91,7 @@ LIB32=xilink6.exe -lib ...@@ -91,7 +91,7 @@ LIB32=xilink6.exe -lib
# PROP Intermediate_Dir "nt" # PROP Intermediate_Dir "nt"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "MYSQL_SERVER_SUFFIX_NT" /FD /c # ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x416 /d "NDEBUG" # ADD BASE RSC /l 0x416 /d "NDEBUG"
# ADD RSC /l 0x416 /d "NDEBUG" # ADD RSC /l 0x416 /d "NDEBUG"
...@@ -115,7 +115,7 @@ LIB32=xilink6.exe -lib ...@@ -115,7 +115,7 @@ LIB32=xilink6.exe -lib
# PROP Intermediate_Dir "max_nt" # PROP Intermediate_Dir "max_nt"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D "MYSQL_SERVER_SUFFIX_NT_MAX" /FD /c # ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "_LIB" /D "_WIN32" /D "WIN32" /D "NDEBUG" /D "MYSQL_SERVER" /D "_MBCS" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x416 /d "NDEBUG" # ADD BASE RSC /l 0x416 /d "NDEBUG"
# ADD RSC /l 0x416 /d "NDEBUG" # ADD RSC /l 0x416 /d "NDEBUG"
......
VC++Files/isamchk/isamchk.dsp
View file @ af44187b
...@@ -97,7 +97,7 @@ LINK32=xilink6.exe ...@@ -97,7 +97,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "_CONSOLE" /D "_WINDOWS" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D MYSQL_COMMERCIAL_LICENSE /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "_CONSOLE" /D "_WINDOWS" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /D LICENSE=Commerical /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x41d /d "NDEBUG" # ADD BASE RSC /l 0x41d /d "NDEBUG"
# ADD RSC /l 0x41d /d "NDEBUG" # ADD RSC /l 0x41d /d "NDEBUG"
......
VC++Files/libmysql/libmysql.dsp
View file @ af44187b
...@@ -92,7 +92,7 @@ LINK32=xilink6.exe ...@@ -92,7 +92,7 @@ LINK32=xilink6.exe
# Begin Special Build Tool # Begin Special Build Tool
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PostBuild_Desc=Move DLL export lib PostBuild_Desc=Move DLL export lib
PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll C:\winnt\system32\ /y xcopy debug\libmysql.lib ..\lib_debug\ /y PostBuild_Cmds=xcopy ..\lib_debug\libmysql.dll %windir%\system32\ /y xcopy debug\libmysql.lib ..\lib_debug\ /y
# End Special Build Tool # End Special Build Tool
!ENDIF !ENDIF
......
VC++Files/libmysqld/libmysqld.dsp
View file @ af44187b
...@@ -83,7 +83,7 @@ BSC32=bscmake.exe ...@@ -83,7 +83,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe 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 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 /pdb:none /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/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_debug\dbug.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\innodb.lib ..\lib_debug\bdb.lib /nologo /dll /pdb:none /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"../lib_debug/libmysqld.dll" /implib:"../lib_debug/libmysqld.lib"
!ELSEIF "$(CFG)" == "libmysqld - Win32 classic" !ELSEIF "$(CFG)" == "libmysqld - Win32 classic"
...@@ -99,8 +99,8 @@ LINK32=xilink6.exe ...@@ -99,8 +99,8 @@ LINK32=xilink6.exe
# PROP Intermediate_Dir "classic" # PROP Intermediate_Dir "classic"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "NDEBUG" /FR /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "NDEBUG" /FR /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WIN32" /D "_WINDOWS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /D "MYSQL_COMMERCIAL_LICENSE" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WIN32" /D "_WINDOWS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "USE_TLS" /D "__WIN__" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /Fr # SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
...@@ -110,9 +110,9 @@ BSC32=bscmake.exe ...@@ -110,9 +110,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe 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\bdb.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.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"
# SUBTRACT BASE LINK32 /pdb:none # 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\bdb.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.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"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "libmysqld - Win32 pro" !ELSEIF "$(CFG)" == "libmysqld - Win32 pro"
...@@ -129,7 +129,7 @@ LINK32=xilink6.exe ...@@ -129,7 +129,7 @@ LINK32=xilink6.exe
# PROP Intermediate_Dir "pro" # PROP Intermediate_Dir "pro"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /I "../bdb/build_win32" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "NDEBUG" /FR /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../sql" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "USE_TLS" /D "__WIN__" /D "NDEBUG" /FR /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WIN32" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "EMBEDDED_LIBRARY" /D "USE_TLS" /D "__WIN__" /D "MYSQL_SERVER" /D LICENCE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /FD /D MYSQL_SEVER_SUFFIX=-pro /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../libmysqld" /I "../sql" /I "../zlib" /D "WIN32" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "EMBEDDED_LIBRARY" /D "USE_TLS" /D "__WIN__" /D "MYSQL_SERVER" /D LICENCE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /FD /D MYSQL_SEVER_SUFFIX=-pro /c
# SUBTRACT CPP /X /Fr # SUBTRACT CPP /X /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
...@@ -140,9 +140,9 @@ BSC32=bscmake.exe ...@@ -140,9 +140,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=xilink6.exe 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\bdb.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.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"
# SUBTRACT BASE LINK32 /pdb:none # 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\bdb.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.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"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ENDIF !ENDIF
......
VC++Files/my_print_defaults/my_print_defaults.dsp
View file @ af44187b
...@@ -92,7 +92,7 @@ LINK32=xilink6.exe ...@@ -92,7 +92,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /YX /FD /c # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "../include" /D "WIN32" /D "_CONSOLE" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /I "../include" /D "WIN32" /D "_CONSOLE" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /YX /FD /c
# ADD BASE RSC /l 0x416 /d "NDEBUG" # ADD BASE RSC /l 0x416 /d "NDEBUG"
# ADD RSC /l 0x416 /d "NDEBUG" # ADD RSC /l 0x416 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
VC++Files/myisamchk/myisamchk.dsp
View file @ af44187b
...@@ -95,7 +95,7 @@ LINK32=xilink6.exe ...@@ -95,7 +95,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FR /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FR /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
......
VC++Files/myisamlog/myisamlog.dsp
View file @ af44187b
...@@ -96,7 +96,7 @@ LINK32=xilink6.exe ...@@ -96,7 +96,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FR /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FR /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
VC++Files/myisampack/myisampack.dsp
View file @ af44187b
...@@ -94,7 +94,7 @@ LINK32=xilink6.exe ...@@ -94,7 +94,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FR /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FR /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../myisam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FR /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
VC++Files/mysql.dsw
View file @ af44187b
...@@ -41,6 +41,9 @@ Package=<4> ...@@ -41,6 +41,9 @@ Package=<4>
Begin Project Dependency Begin Project Dependency
Project_Dep_Name mysys Project_Dep_Name mysys
End Project Dependency End Project Dependency
Begin Project Dependency
Project_Dep_Name strings
End Project Dependency
}}} }}}
############################################################################### ###############################################################################
......
VC++Files/mysqlbinlog/mysqlbinlog.dsp
View file @ af44187b
...@@ -93,7 +93,7 @@ LINK32=xilink6.exe ...@@ -93,7 +93,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "MYSQL_SERVER" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "MYSQL_SERVER" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
VC++Files/mysqlcheck/mysqlcheck.dsp
View file @ af44187b
...@@ -92,7 +92,7 @@ LINK32=xilink6.exe ...@@ -92,7 +92,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /D "NDEBUG" /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "MYSQL_SERVER" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "MYSQL_SERVER" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
VC++Files/mysys/mysys.dsp
View file @ af44187b
...@@ -91,7 +91,7 @@ LIB32=xilink6.exe -lib ...@@ -91,7 +91,7 @@ LIB32=xilink6.exe -lib
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "USE_SYMDIR" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D MYSQL_SERVER_SUFFIX_MAX /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "USE_SYMDIR" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D MYSQL_SERVER_SUFFIX=-max /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
......
VC++Files/pack_isam/pack_isam.dsp
View file @ af44187b
...@@ -93,7 +93,7 @@ LINK32=xilink6.exe ...@@ -93,7 +93,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../isam" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
VC++Files/perror/perror.dsp
View file @ af44187b
...@@ -102,7 +102,7 @@ LINK32=xilink6.exe ...@@ -102,7 +102,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "WIN32" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "WIN32" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
......
VC++Files/replace/replace.dsp
View file @ af44187b
...@@ -96,7 +96,7 @@ LINK32=xilink6.exe ...@@ -96,7 +96,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "_CONSOLE" /D "_WINDOWS" /D MYSQL_COMMERCIAL_LICENSE /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commerical /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x40b /d "NDEBUG" # ADD BASE RSC /l 0x40b /d "NDEBUG"
# ADD RSC /l 0x40b /d "NDEBUG" # ADD RSC /l 0x40b /d "NDEBUG"
......
VC++Files/sql/mysqld.dsp
View file @ af44187b
...@@ -102,7 +102,7 @@ LINK32=xilink6.exe ...@@ -102,7 +102,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D "DBUG_OFF" /FD /c # ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D "DBUG_OFF" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_NT" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x410 /d "NDEBUG" # ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
...@@ -130,7 +130,7 @@ LINK32=xilink6.exe ...@@ -130,7 +130,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_NT_MAX" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
...@@ -159,7 +159,7 @@ LINK32=xilink6.exe ...@@ -159,7 +159,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_MAX" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
...@@ -187,7 +187,7 @@ LINK32=xilink6.exe ...@@ -187,7 +187,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_COMMERCIAL_LICENSE" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D LICENSE=Commercial /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "HAVE_DLOPEN" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -215,7 +215,7 @@ LINK32=xilink6.exe ...@@ -215,7 +215,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_SERVER" /D LICENCE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D "MYSQL_SERVER_SUFFIX_PRO" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_SERVER" /D LICENCE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D MYSQL_SERVER_SUFFIX=-pro /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -243,7 +243,7 @@ LINK32=xilink6.exe ...@@ -243,7 +243,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_NT" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
...@@ -272,7 +272,7 @@ LINK32=xilink6.exe ...@@ -272,7 +272,7 @@ LINK32=xilink6.exe
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENCE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "MYSQL_SERVER_SUFFIX_PRO_NT" /FD # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENCE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt" /FD
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
......
include/my_global.h
View file @ af44187b
...@@ -338,6 +338,9 @@ C_MODE_END ...@@ -338,6 +338,9 @@ C_MODE_END
#define USE_BMOVE512 1 /* Use this unless system bmove is faster */ #define USE_BMOVE512 1 /* Use this unless system bmove is faster */
#endif #endif
#define QUOTE_ARG(x) #x /* Quote argument (before cpp) */
#define STRINGIFY_ARG(x) QUOTE_ARG(x) /* Quote argument, after cpp */
/* Paranoid settings. Define I_AM_PARANOID if you are paranoid */ /* Paranoid settings. Define I_AM_PARANOID if you are paranoid */
#ifdef I_AM_PARANOID #ifdef I_AM_PARANOID
#define DONT_ALLOW_USER_CHANGE 1 #define DONT_ALLOW_USER_CHANGE 1
......
include/mysql_version.h.in
View file @ af44187b
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
#define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define PROTOCOL_VERSION @PROTOCOL_VERSION@
#define MYSQL_SERVER_VERSION "@VERSION@" #define MYSQL_SERVER_VERSION "@VERSION@"
#define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@" #define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@"
#ifndef MYSQL_SERVER_SUFFIX #define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@"
#define MYSQL_SERVER_SUFFIX "@MYSQL_SERVER_SUFFIX@"
#endif
#define FRM_VER @DOT_FRM_VERSION@ #define FRM_VER @DOT_FRM_VERSION@
#define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@
#define MYSQL_PORT @MYSQL_TCP_PORT@ #define MYSQL_PORT @MYSQL_TCP_PORT@
...@@ -25,11 +23,7 @@ ...@@ -25,11 +23,7 @@
#endif /* _CUSTOMCONFIG_ */ #endif /* _CUSTOMCONFIG_ */
#ifndef LICENSE #ifndef LICENSE
#ifdef MYSQL_COMMERICAL_LICENSE #define LICENSE GPL
#define LICENSE "Commerical"
#else
#define LICENSE "GPL"
#endif
#endif /* LICENSE */ #endif /* LICENSE */
#endif /* _mysql_version_h */ #endif /* _mysql_version_h */
innobase/eval/eval0eval.c
View file @ af44187b
...@@ -725,7 +725,7 @@ eval_predefined( ...@@ -725,7 +725,7 @@ eval_predefined(
uint_val = (ulint) int_val; uint_val = (ulint) int_val;
} }
for (tmp = int_len; uint_val > 0; uint_val /= 10) { for (tmp = int_len; uint_val > 0; uint_val /= 10) {
data[--tmp] = '0' + (byte)(uint_val % 10); data[--tmp] = (byte) ('0' + (byte)(uint_val % 10));
} }
} }
......
innobase/sync/sync0arr.c
View file @ af44187b
...@@ -449,7 +449,6 @@ sync_array_cell_print( ...@@ -449,7 +449,6 @@ sync_array_cell_print(
{ {
mutex_t* mutex; mutex_t* mutex;
rw_lock_t* rwlock; rw_lock_t* rwlock;
char* str __attribute__((unused)) = NULL;
ulint type; ulint type;
type = cell->request_type; type = cell->request_type;
......
libmysql/libmysql.c
View file @ af44187b
...@@ -627,7 +627,7 @@ static int check_license(MYSQL *mysql) ...@@ -627,7 +627,7 @@ static int check_license(MYSQL *mysql)
MYSQL_RES *res; MYSQL_RES *res;
NET *net= &mysql->net; NET *net= &mysql->net;
static const char query[]= "SELECT @@license"; static const char query[]= "SELECT @@license";
static const char required_license[]= LICENSE; static const char required_license[]= STRINGIFY_ARG(LICENSE);
if (mysql_real_query(mysql, query, sizeof(query)-1)) if (mysql_real_query(mysql, query, sizeof(query)-1))
{ {
......
sql-bench/crash-me.sh
View file @ af44187b
...@@ -414,8 +414,7 @@ if ($dbh->do("create table crash_q (a integer, b integer,c1 CHAR(10))") && ...@@ -414,8 +414,7 @@ if ($dbh->do("create table crash_q (a integer, b integer,c1 CHAR(10))") &&
["with add primary key", ["with add primary key",
"alter table crash_q1 add primary key(c1)"]); "alter table crash_q1 add primary key(c1)"]);
report("Alter table add foreign key",'alter_add_foreign_key', report("Alter table add foreign key",'alter_add_foreign_key',
"alter table crash_q add constraint f1 foreign key(c1)", "alter table crash_q add constraint f1 foreign key(c1) references crash_q1(c1)");
" references crash_q1(c1)");
try_and_report("Alter table drop foreign key",'alter_drop_foreign_key', try_and_report("Alter table drop foreign key",'alter_drop_foreign_key',
["with drop constraint", ["with drop constraint",
"alter table crash_q drop constraint f1"], "alter table crash_q drop constraint f1"],
......
sql-bench/limits/mysql-4.0.cfg
View file @ af44187b
...@@ -13,6 +13,8 @@ NEG=yes # update of column= -column ...@@ -13,6 +13,8 @@ NEG=yes # update of column= -column
###As far as all queries returned OK, result is YES ###As far as all queries returned OK, result is YES
Need_cast_for_null=no # Need to cast NULL for arithmetic Need_cast_for_null=no # Need to cast NULL for arithmetic
### Check if numeric_null (NULL) is 'NULL' ### Check if numeric_null (NULL) is 'NULL'
### Check if numeric_null (NULL) is 'NULL'
### Check if numeric_null (NULL) is 'NULL'
alter_add_col=yes # Alter table add column alter_add_col=yes # Alter table add column
###< alter table crash_q add d integer ###< alter table crash_q add d integer
###> OK ###> OK
...@@ -187,6 +189,22 @@ constraint_check=syntax only # Column constraints ...@@ -187,6 +189,22 @@ constraint_check=syntax only # Column constraints
### ###
###< drop table crash_q ###< drop table crash_q
###> OK ###> OK
###< create table crash_q (a int check (a>0))
###> OK
###
###< insert into crash_q values(0)
###> OK
###
###< drop table crash_q
###> OK
###< create table crash_q (a int check (a>0))
###> OK
###
###< insert into crash_q values(0)
###> OK
###
###< drop table crash_q
###> OK
constraint_check_named=syntax only # Named constraints constraint_check_named=syntax only # Named constraints
###< create table crash_q (a int ,b int, constraint abc check (a>b)) ###< create table crash_q (a int ,b int, constraint abc check (a>b))
###> OK ###> OK
...@@ -196,6 +214,22 @@ constraint_check_named=syntax only # Named constraints ...@@ -196,6 +214,22 @@ constraint_check_named=syntax only # Named constraints
### ###
###< drop table crash_q ###< drop table crash_q
###> OK ###> OK
###< create table crash_q (a int ,b int, constraint abc check (a>b))
###> OK
###
###< insert into crash_q values(0,0)
###> OK
###
###< drop table crash_q
###> OK
###< create table crash_q (a int ,b int, constraint abc check (a>b))
###> OK
###
###< insert into crash_q values(0,0)
###> OK
###
###< drop table crash_q
###> OK
constraint_check_table=syntax only # Table constraints constraint_check_table=syntax only # Table constraints
###< create table crash_q (a int ,b int, check (a>b)) ###< create table crash_q (a int ,b int, check (a>b))
###> OK ###> OK
...@@ -205,6 +239,22 @@ constraint_check_table=syntax only # Table constraints ...@@ -205,6 +239,22 @@ constraint_check_table=syntax only # Table constraints
### ###
###< drop table crash_q ###< drop table crash_q
###> OK ###> OK
###< create table crash_q (a int ,b int, check (a>b))
###> OK
###
###< insert into crash_q values(0,0)
###> OK
###
###< drop table crash_q
###> OK
###< create table crash_q (a int ,b int, check (a>b))
###> OK
###
###< insert into crash_q values(0,0)
###> OK
###
###< drop table crash_q
###> OK
constraint_null=yes # NULL constraint (SyBase style) constraint_null=yes # NULL constraint (SyBase style)
###< create table crash_q (a int null) ###< create table crash_q (a int null)
###> OK ###> OK
...@@ -348,6 +398,20 @@ date_format_inresult=iso # Date format in result ...@@ -348,6 +398,20 @@ date_format_inresult=iso # Date format in result
###> 2003-08-27 ###> 2003-08-27
###< delete from crash_me_d ###< delete from crash_me_d
###> OK ###> OK
###< insert into crash_me_d values( sysdate() )
###> OK
###
###< select a from crash_me_d
###> 2004-05-20
###< delete from crash_me_d
###> OK
###< insert into crash_me_d values( sysdate() )
###> OK
###
###< select a from crash_me_d
###> 2004-05-20
###< delete from crash_me_d
###> OK
date_infinity=error # Supports 'infinity dates date_infinity=error # Supports 'infinity dates
###< create table crash_me2 (a date not null) ###< create table crash_me2 (a date not null)
###> OK ###> OK
...@@ -460,6 +524,14 @@ drop_requires_cascade=no # drop table require cascade/restrict ...@@ -460,6 +524,14 @@ drop_requires_cascade=no # drop table require cascade/restrict
###> OK ###> OK
###< drop table crash_me ###< drop table crash_me
###> OK ###> OK
###< create table crash_me (a integer not null)
###> OK
###< drop table crash_me
###> OK
###< create table crash_me (a integer not null)
###> OK
###< drop table crash_me
###> OK
drop_restrict=yes # drop table with cascade/restrict drop_restrict=yes # drop table with cascade/restrict
###< create table crash_q (a int) ###< create table crash_q (a int)
###> OK ###> OK
...@@ -524,6 +596,40 @@ foreign_key=syntax only # foreign keys ...@@ -524,6 +596,40 @@ foreign_key=syntax only # foreign keys
### ###
###< drop table crash_me_qf ###< drop table crash_me_qf
###> OK ###> OK
###< create table crash_me_qf (a integer not null,primary key (a))
###> OK
###
###< create table crash_me_qf2 (a integer not null,foreign key (a) references crash_me_qf (a))
###> OK
###
###< insert into crash_me_qf values (1)
###> OK
###
###< insert into crash_me_qf2 values (2)
###> OK
###
###< drop table crash_me_qf2
###> OK
###
###< drop table crash_me_qf
###> OK
###< create table crash_me_qf (a integer not null,primary key (a))
###> OK
###
###< create table crash_me_qf2 (a integer not null,foreign key (a) references crash_me_qf (a))
###> OK
###
###< insert into crash_me_qf values (1)
###> OK
###
###< insert into crash_me_qf2 values (2)
###> OK
###
###< drop table crash_me_qf2
###> OK
###
###< drop table crash_me_qf
###> OK
full_outer_join=no # full outer join full_outer_join=no # full outer join
###< select crash_me.a from crash_me full join crash_me2 ON ###< select crash_me.a from crash_me full join crash_me2 ON
### crash_me.a=crash_me2.a ### crash_me.a=crash_me2.a
...@@ -856,6 +962,10 @@ func_extra_months_between=no # Function MONTHS_BETWEEN ...@@ -856,6 +962,10 @@ func_extra_months_between=no # Function MONTHS_BETWEEN
func_extra_noround=no # Function NOROUND func_extra_noround=no # Function NOROUND
###< select noround(22.6) ###< select noround(22.6)
###> execute error:You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '(22.6)' at line 1 ###> execute error:You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '(22.6)' at line 1
###< select noround(22.6)
###> execute error:You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '(22.6)' at line 1
###< select noround(22.6)
###> execute error:You have an error in your SQL syntax. Check the manual that corresponds to your MySQL server version for the right syntax to use near '(22.6)' at line 1
func_extra_not=yes # Function NOT in SELECT func_extra_not=yes # Function NOT in SELECT
### ###
###<select not 0 ###<select not 0
...@@ -1150,21 +1260,29 @@ func_odbc_dayname=yes # Function DAYNAME ...@@ -1150,21 +1260,29 @@ func_odbc_dayname=yes # Function DAYNAME
### ###
###<select dayname(a) from crash_me_d ###<select dayname(a) from crash_me_d
###>Saturday ###>Saturday
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_odbc_dayofmonth=yes # Function DAYOFMONTH func_odbc_dayofmonth=yes # Function DAYOFMONTH
###< insert into crash_me_d values('1997-02-01') ###< insert into crash_me_d values('1997-02-01')
### ###
###<select dayofmonth(a) from crash_me_d ###<select dayofmonth(a) from crash_me_d
###>1 ###>1
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_odbc_dayofweek=yes # Function DAYOFWEEK func_odbc_dayofweek=yes # Function DAYOFWEEK
###< insert into crash_me_d values('1997-02-01') ###< insert into crash_me_d values('1997-02-01')
### ###
###<select dayofweek(a) from crash_me_d ###<select dayofweek(a) from crash_me_d
###>7 ###>7
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_odbc_dayofyear=yes # Function DAYOFYEAR func_odbc_dayofyear=yes # Function DAYOFYEAR
###< insert into crash_me_d values('1997-02-01') ###< insert into crash_me_d values('1997-02-01')
### ###
###<select dayofyear(a) from crash_me_d ###<select dayofyear(a) from crash_me_d
###>32 ###>32
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_odbc_degrees=yes # Function DEGREES func_odbc_degrees=yes # Function DEGREES
### ###
###<select degrees(6.283185) ###<select degrees(6.283185)
...@@ -1193,11 +1311,15 @@ func_odbc_hour=yes # Function HOUR ...@@ -1193,11 +1311,15 @@ func_odbc_hour=yes # Function HOUR
### ###
###<select hour('12:13:14') ###<select hour('12:13:14')
###>12 ###>12
###< insert into crash_me_t values(20:08:16)
###< insert into crash_me_t values(20:08:16)
func_odbc_hour_time=yes # Function ANSI HOUR func_odbc_hour_time=yes # Function ANSI HOUR
###< insert into crash_me_t values(20:08:16) ###< insert into crash_me_t values(20:08:16)
### ###
###<select hour(TIME '12:13:14') ###<select hour(TIME '12:13:14')
###>12 ###>12
###< insert into crash_me_t values(20:08:16)
###< insert into crash_me_t values(20:08:16)
func_odbc_ifnull=yes # Function IFNULL func_odbc_ifnull=yes # Function IFNULL
### ###
###<select ifnull(2,3) ###<select ifnull(2,3)
...@@ -1252,6 +1374,8 @@ func_odbc_minute=yes # Function MINUTE ...@@ -1252,6 +1374,8 @@ func_odbc_minute=yes # Function MINUTE
### ###
###<select minute('12:13:14') ###<select minute('12:13:14')
###>13 ###>13
###< insert into crash_me_t values(20:08:16)
###< insert into crash_me_t values(20:08:16)
func_odbc_mod=yes # Function MOD func_odbc_mod=yes # Function MOD
### ###
###<select mod(11,7) ###<select mod(11,7)
...@@ -1261,11 +1385,15 @@ func_odbc_month=yes # Function MONTH ...@@ -1261,11 +1385,15 @@ func_odbc_month=yes # Function MONTH
### ###
###<select month(a) from crash_me_d ###<select month(a) from crash_me_d
###>2 ###>2
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_odbc_monthname=yes # Function MONTHNAME func_odbc_monthname=yes # Function MONTHNAME
###< insert into crash_me_d values('1997-02-01') ###< insert into crash_me_d values('1997-02-01')
### ###
###<select monthname(a) from crash_me_d ###<select monthname(a) from crash_me_d
###>February ###>February
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_odbc_now=yes # Function NOW func_odbc_now=yes # Function NOW
### ###
###<select now() ###<select now()
...@@ -1283,6 +1411,8 @@ func_odbc_quarter=yes # Function QUARTER ...@@ -1283,6 +1411,8 @@ func_odbc_quarter=yes # Function QUARTER
### ###
###<select quarter(a) from crash_me_d ###<select quarter(a) from crash_me_d
###>1 ###>1
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_odbc_radians=yes # Function RADIANS func_odbc_radians=yes # Function RADIANS
### ###
###<select radians(360) ###<select radians(360)
...@@ -1316,6 +1446,8 @@ func_odbc_second=yes # Function SECOND ...@@ -1316,6 +1446,8 @@ func_odbc_second=yes # Function SECOND
### ###
###<select second('12:13:14') ###<select second('12:13:14')
###>14 ###>14
###< insert into crash_me_t values(20:08:16)
###< insert into crash_me_t values(20:08:16)
func_odbc_sign=yes # Function SIGN func_odbc_sign=yes # Function SIGN
### ###
###<select sign(-5) ###<select sign(-5)
...@@ -1374,11 +1506,19 @@ func_odbc_week=USA # WEEK ...@@ -1374,11 +1506,19 @@ func_odbc_week=USA # WEEK
###<select week('1997-02-01') ###<select week('1997-02-01')
###>4 ###>4
###We expected '5' but got '4' ###We expected '5' but got '4'
###<select week('1997-02-01')
###>4
###We expected '5' but got '4'
###<select week('1997-02-01')
###>4
###We expected '5' but got '4'
func_odbc_year=yes # Function YEAR func_odbc_year=yes # Function YEAR
###< insert into crash_me_d values('1997-02-01') ###< insert into crash_me_d values('1997-02-01')
### ###
###<select year(a) from crash_me_d ###<select year(a) from crash_me_d
###>1997 ###>1997
###< insert into crash_me_d values('1997-02-01')
###< insert into crash_me_d values('1997-02-01')
func_sql_+=yes # Function +, -, * and / func_sql_+=yes # Function +, -, * and /
### ###
###<select 5*3-4/2+1 ###<select 5*3-4/2+1
...@@ -1431,6 +1571,13 @@ func_sql_current_user=with_parenthesis # CURRENT_USER ...@@ -1431,6 +1571,13 @@ func_sql_current_user=with_parenthesis # CURRENT_USER
### ###
###< select CURRENT_USER() ###< select CURRENT_USER()
###> OK ###> OK
###< select CURRENT_USER
###> OK
###< select CURRENT_USER
###> execute error:Unknown column 'CURRENT_USER' in 'field list'
###
###< select CURRENT_USER()
###> OK
func_sql_extract_sql=yes # Function EXTRACT func_sql_extract_sql=yes # Function EXTRACT
### ###
###<select extract(minute from timestamp '2000-02-23 18:43:12.987') ###<select extract(minute from timestamp '2000-02-23 18:43:12.987')
...@@ -1473,6 +1620,16 @@ func_sql_session_user=with_parenthesis # SESSION_USER ...@@ -1473,6 +1620,16 @@ func_sql_session_user=with_parenthesis # SESSION_USER
### ###
###< select SESSION_USER() ###< select SESSION_USER()
###> OK ###> OK
###< select SESSION_USER
###> execute error:Unknown column 'SESSION_USER' in 'field list'
###
###< select SESSION_USER()
###> OK
###< select SESSION_USER
###> execute error:Unknown column 'SESSION_USER' in 'field list'
###
###< select SESSION_USER()
###> OK
func_sql_simple_case=yes # Function simple CASE func_sql_simple_case=yes # Function simple CASE
### ###
###<select case 2 when 1 then 'false' when 2 then 'true' end ###<select case 2 when 1 then 'false' when 2 then 'true' end
...@@ -1487,6 +1644,16 @@ func_sql_system_user=with_parenthesis # SYSTEM_USER ...@@ -1487,6 +1644,16 @@ func_sql_system_user=with_parenthesis # SYSTEM_USER
### ###
###< select SYSTEM_USER() ###< select SYSTEM_USER()
###> OK ###> OK
###< select SYSTEM_USER
###> execute error:Unknown column 'SYSTEM_USER' in 'field list'
###
###< select SYSTEM_USER()
###> OK
###< select SYSTEM_USER
###> execute error:Unknown column 'SYSTEM_USER' in 'field list'
###
###< select SYSTEM_USER()
###> OK
func_sql_trim=yes # Function TRIM func_sql_trim=yes # Function TRIM
### ###
###<select trim(trailing from trim(LEADING FROM ' abc ')) ###<select trim(trailing from trim(LEADING FROM ' abc '))
...@@ -1501,6 +1668,16 @@ func_sql_user=with_parenthesis # USER ...@@ -1501,6 +1668,16 @@ func_sql_user=with_parenthesis # USER
### ###
###< select USER() ###< select USER()
###> OK ###> OK
###< select USER
###> execute error:Unknown column 'USER' in 'field list'
###
###< select USER()
###> OK
###< select USER
###> execute error:Unknown column 'USER' in 'field list'
###
###< select USER()
###> OK
func_where_between=yes # Function BETWEEN func_where_between=yes # Function BETWEEN
### ###
###<select a from crash_me where 5 between 4 and 6 ###<select a from crash_me where 5 between 4 and 6
...@@ -1693,6 +1870,10 @@ group_on_unused=yes # Group on unused column ...@@ -1693,6 +1870,10 @@ group_on_unused=yes # Group on unused column
has_true_false=no # TRUE and FALSE has_true_false=no # TRUE and FALSE
###< select (1=1)=true ###< select (1=1)=true
###> execute error:Unknown column 'true' in 'field list' ###> execute error:Unknown column 'true' in 'field list'
###< select (1=1)=true
###> OK
###< select (1=1)=true
###> execute error:Unknown column 'true' in 'field list'
having=yes # Having having=yes # Having
###<select a from crash_me group by a having a > 0 ###<select a from crash_me group by a having a > 0
###>1 ###>1
...@@ -1918,6 +2099,8 @@ max_expressions=1450 # simple expressions ...@@ -1918,6 +2099,8 @@ max_expressions=1450 # simple expressions
### 5000:FAIL 1000:OK 3000:FAIL 1400:OK 2200:FAIL 1560:FAIL 1432:OK 1496:FAIL 1445:OK 1470:FAIL 1450:OK 1460:FAIL 1452:FAIL 1451:FAIL ### 5000:FAIL 1000:OK 3000:FAIL 1400:OK 2200:FAIL 1560:FAIL 1432:OK 1496:FAIL 1445:OK 1470:FAIL 1450:OK 1460:FAIL 1452:FAIL 1451:FAIL
max_index=32 # max index max_index=32 # max index
### max_unique_index=32 ,so max_index must be same ### max_unique_index=32 ,so max_index must be same
### max_unique_index=32 ,so max_index must be same
### max_unique_index=32 ,so max_index must be same
max_index_length=500 # index length max_index_length=500 # index length
###We are trying (example with N=5): ###We are trying (example with N=5):
###create table crash_q (q0 char(5) not null,unique (q0)) ###create table crash_q (q0 char(5) not null,unique (q0))
...@@ -2070,6 +2253,14 @@ no_primary_key=yes # Tables without primary key ...@@ -2070,6 +2253,14 @@ no_primary_key=yes # Tables without primary key
###> OK ###> OK
###< insert into crash_me (a,b) values (1,'a') ###< insert into crash_me (a,b) values (1,'a')
###> OK ###> OK
###< create table crash_me (a integer not null,b char(10) not null)
###> OK
###< insert into crash_me (a,b) values (1,'a')
###> OK
###< create table crash_me (a integer not null,b char(10) not null)
###> OK
###< insert into crash_me (a,b) values (1,'a')
###> OK
not_id_between=no # NOT ID BETWEEN interprets as ID NOT BETWEEN not_id_between=no # NOT ID BETWEEN interprets as ID NOT BETWEEN
###< create table crash_me_b (i int) ###< create table crash_me_b (i int)
###> OK ###> OK
...@@ -2083,6 +2274,30 @@ not_id_between=no # NOT ID BETWEEN interprets as ID NOT BETWEEN ...@@ -2083,6 +2274,30 @@ not_id_between=no # NOT ID BETWEEN interprets as ID NOT BETWEEN
### ###
###< drop table crash_me_b ###< drop table crash_me_b
###> OK ###> OK
###< create table crash_me_b (i int)
###> OK
###< insert into crash_me_b values(2)
###> OK
###< insert into crash_me_b values(5)
###> OK
###
###<select i from crash_me_b where not i between 1 and 3
###> didn't return any result:
###
###< drop table crash_me_b
###> OK
###< create table crash_me_b (i int)
###> OK
###< insert into crash_me_b values(2)
###> OK
###< insert into crash_me_b values(5)
###> OK
###
###<select i from crash_me_b where not i between 1 and 3
###> didn't return any result:
###
###< drop table crash_me_b
###> OK
null_concat_expr=yes # Is concat('a',NULL) = NULL null_concat_expr=yes # Is concat('a',NULL) = NULL
### ###
###<select concat('a',NULL) ###<select concat('a',NULL)
...@@ -2173,6 +2388,26 @@ position_of_null=first # Where is null values in sorted recordset ...@@ -2173,6 +2388,26 @@ position_of_null=first # Where is null values in sorted recordset
###> 2 ###> 2
###> 3 ###> 3
###> 4 ###> 4
###< insert into crash_me_n (i) values(1)
###> OK
###< insert into crash_me_n values(2,2)
###> OK
###< insert into crash_me_n values(3,3)
###> OK
###< insert into crash_me_n values(4,4)
###> OK
###< insert into crash_me_n (i) values(5)
###> OK
###< insert into crash_me_n (i) values(1)
###> OK
###< insert into crash_me_n values(2,2)
###> OK
###< insert into crash_me_n values(3,3)
###> OK
###< insert into crash_me_n values(4,4)
###> OK
###< insert into crash_me_n (i) values(5)
###> OK
position_of_null_desc=last # Where is null values in sorted recordset (DESC) position_of_null_desc=last # Where is null values in sorted recordset (DESC)
###< select r from crash_me_n order by r desc ###< select r from crash_me_n order by r desc
###> 4 ###> 4
...@@ -6053,7 +6288,7 @@ select_without_from=yes # SELECT without FROM ...@@ -6053,7 +6288,7 @@ select_without_from=yes # SELECT without FROM
###> OK ###> OK
### ###
###As far as all queries returned OK, result is YES ###As far as all queries returned OK, result is YES
server_version=MySQL 4.0.15 debug log/ # server version server_version=MySQL 4.0.20 debug/ # server version
simple_joins=yes # ANSI SQL simple joins simple_joins=yes # ANSI SQL simple joins
###< select crash_me.a from crash_me, crash_me t0 ###< select crash_me.a from crash_me, crash_me t0
###> OK ###> OK
...@@ -6223,6 +6458,20 @@ time_format_inresult=iso # Time format in result ...@@ -6223,6 +6458,20 @@ time_format_inresult=iso # Time format in result
###> 19:55:21 ###> 19:55:21
###< delete from crash_me_t ###< delete from crash_me_t
###> OK ###> OK
###< insert into crash_me_t values(CURRENT_TIME)
###> OK
###
###< select a from crash_me_t
###> 13:45:04
###< delete from crash_me_t
###> OK
###< insert into crash_me_t values(CURRENT_TIME)
###> OK
###
###< select a from crash_me_t
###> 13:47:18
###< delete from crash_me_t
###> OK
transactions=yes # transactions transactions=yes # transactions
###<select * from crash_q ###<select * from crash_q
###>1 ###>1
......
sql/mysqld.cc
View file @ af44187b
...@@ -5818,12 +5818,12 @@ static void get_options(int argc,char **argv) ...@@ -5818,12 +5818,12 @@ static void get_options(int argc,char **argv)
static void set_server_version(void) static void set_server_version(void)
{ {
char *end= strxmov(server_version, MYSQL_SERVER_VERSION, char *end= strxmov(server_version, MYSQL_SERVER_VERSION,
MYSQL_SERVER_SUFFIX, NullS); MYSQL_SERVER_SUFFIX_STR, NullS);
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
end= strmov(end, "-embedded"); end= strmov(end, "-embedded");
#endif #endif
#ifndef DBUG_OFF #ifndef DBUG_OFF
if (!strstr(MYSQL_SERVER_SUFFIX, "-debug")) if (!strstr(MYSQL_SERVER_SUFFIX_STR, "-debug"))
end= strmov(end, "-debug"); end= strmov(end, "-debug");
#endif #endif
if (opt_log || opt_update_log || opt_slow_log || opt_bin_log) if (opt_log || opt_update_log || opt_slow_log || opt_bin_log)
......
sql/mysqld_suffix.h
View file @ af44187b
...@@ -15,24 +15,13 @@ ...@@ -15,24 +15,13 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* /*
Set MYSQL_SERVER_SUFFIX Set MYSQL_SERVER_SUFFIX_STR
The following code is quite ugly as there is no portable way to set a The following code is quite ugly as there is no portable way to easily set a
string to the value of a macro string to the value of a macro
*/ */
#if defined(MYSQL_SERVER_SUFFIX_NT) #ifdef MYSQL_SERVER_SUFFIX
#undef MYSQL_SERVER_SUFFIX #define MYSQL_SERVER_SUFFIX_STR STRINGIFY_ARG(MYSQL_SERVER_SUFFIX)
#define MYSQL_SERVER_SUFFIX "-nt" #else
#elif defined(MYSQL_SERVER_SUFFIX_MAX) #define MYSQL_SERVER_SUFFIX_STR MYSQL_SERVER_SUFFIX_DEF
#undef MYSQL_SERVER_SUFFIX
#define MYSQL_SERVER_SUFFIX "-max"
#elif defined(MYSQL_SERVER_SUFFIX_NT_MAX)
#undef MYSQL_SERVER_SUFFIX
#define MYSQL_SERVER_SUFFIX "-nt-max"
#elif defined(MYSQL_SERVER_SUFFIX_PRO)
#undef MYSQL_SERVER_SUFFIX
#define MYSQL_SERVER_SUFFIX "-pro"
#elif defined(MYSQL_SERVER_SUFFIX_PRO_NT)
#undef MYSQL_SERVER_SUFFIX
#define MYSQL_SERVER_SUFFIX "-pro-nt"
#endif #endif
sql/set_var.cc
View file @ af44187b
...@@ -442,7 +442,7 @@ sys_var_thd_ulong sys_group_concat_max_len("group_concat_max_len", ...@@ -442,7 +442,7 @@ sys_var_thd_ulong sys_group_concat_max_len("group_concat_max_len",
sys_var_const_str sys_os("version_compile_os", SYSTEM_TYPE); sys_var_const_str sys_os("version_compile_os", SYSTEM_TYPE);
/* Global read-only variable describing server license */ /* Global read-only variable describing server license */
sys_var_const_str sys_license("license", LICENSE); sys_var_const_str sys_license("license", STRINGIFY_ARG(LICENSE));
/* /*
......
sql/slave.cc
View file @ af44187b
...@@ -2487,13 +2487,17 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type) ...@@ -2487,13 +2487,17 @@ static int init_slave_thread(THD* thd, SLAVE_THD_TYPE thd_type)
thd->master_access= ~0; thd->master_access= ~0;
thd->priv_user = 0; thd->priv_user = 0;
thd->slave_thread = 1; thd->slave_thread = 1;
thd->options = ((opt_log_slave_updates) ? OPTION_BIN_LOG:0) |
OPTION_AUTO_IS_NULL;
/* /*
It's nonsense to constrain the slave threads with max_join_size; if a It's nonsense to constrain the slave threads with max_join_size; if a
query succeeded on master, we HAVE to execute it. query succeeded on master, we HAVE to execute it. So set
OPTION_BIG_SELECTS. Setting max_join_size to HA_POS_ERROR is not enough
(and it's not needed if we have OPTION_BIG_SELECTS) because an INSERT
SELECT examining more than 4 billion rows would still fail (yes, because
when max_join_size is 4G, OPTION_BIG_SELECTS is automatically set, but
only for client threads.
*/ */
thd->variables.max_join_size= HA_POS_ERROR; thd->options = ((opt_log_slave_updates) ? OPTION_BIN_LOG:0) |
OPTION_AUTO_IS_NULL | OPTION_BIG_SELECTS;
thd->client_capabilities = CLIENT_LOCAL_FILES; thd->client_capabilities = CLIENT_LOCAL_FILES;
thd->real_id=pthread_self(); thd->real_id=pthread_self();
pthread_mutex_lock(&LOCK_thread_count); pthread_mutex_lock(&LOCK_thread_count);
......
zlib/contrib/asm386/zlibvc.dsp
View file @ af44187b
...@@ -8,16 +8,16 @@ ...@@ -8,16 +8,16 @@
CFG=zlibvc - Win32 Release CFG=zlibvc - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run !MESSAGE use the Export Makefile command and run
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "zlibvc.mak". !MESSAGE NMAKE /f "zlibvc.mak".
!MESSAGE !MESSAGE
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f "zlibvc.mak" CFG="zlibvc - Win32 Release" !MESSAGE NMAKE /f "zlibvc.mak" CFG="zlibvc - Win32 Release"
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "zlibvc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "zlibvc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "zlibvc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "zlibvc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "zlibvc - Win32 ReleaseAxp" (based on\ !MESSAGE "zlibvc - Win32 ReleaseAxp" (based on\
...@@ -26,7 +26,7 @@ CFG=zlibvc - Win32 Release ...@@ -26,7 +26,7 @@ CFG=zlibvc - Win32 Release
"Win32 (x86) Dynamic-Link Library") "Win32 (x86) Dynamic-Link Library")
!MESSAGE "zlibvc - Win32 ReleaseWithoutCrtdll" (based on\ !MESSAGE "zlibvc - Win32 ReleaseWithoutCrtdll" (based on\
"Win32 (x86) Dynamic-Link Library") "Win32 (x86) Dynamic-Link Library")
!MESSAGE !MESSAGE
# Begin Project # Begin Project
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
...@@ -191,7 +191,7 @@ LINK32=link.exe ...@@ -191,7 +191,7 @@ LINK32=link.exe
# ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_1\zlib.dll" # ADD LINK32 gvmat32.obj kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib crtdll.lib /nologo /subsystem:windows /dll /map /machine:I386 /nodefaultlib /out:".\zlibvc_1\zlib.dll"
# SUBTRACT LINK32 /pdb:none # SUBTRACT LINK32 /pdb:none
!ENDIF !ENDIF
# Begin Target # Begin Target
...@@ -216,13 +216,13 @@ SOURCE=.\adler32.c ...@@ -216,13 +216,13 @@ SOURCE=.\adler32.c
DEP_CPP_ADLER=\ DEP_CPP_ADLER=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -238,13 +238,13 @@ SOURCE=.\compress.c ...@@ -238,13 +238,13 @@ SOURCE=.\compress.c
DEP_CPP_COMPR=\ DEP_CPP_COMPR=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -260,13 +260,13 @@ SOURCE=.\crc32.c ...@@ -260,13 +260,13 @@ SOURCE=.\crc32.c
DEP_CPP_CRC32=\ DEP_CPP_CRC32=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -284,13 +284,13 @@ DEP_CPP_DEFLA=\ ...@@ -284,13 +284,13 @@ DEP_CPP_DEFLA=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -307,7 +307,7 @@ SOURCE=.\gvmat32c.c ...@@ -307,7 +307,7 @@ SOURCE=.\gvmat32c.c
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -324,13 +324,13 @@ DEP_CPP_GZIO_=\ ...@@ -324,13 +324,13 @@ DEP_CPP_GZIO_=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -351,13 +351,13 @@ DEP_CPP_INFBL=\ ...@@ -351,13 +351,13 @@ DEP_CPP_INFBL=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -379,13 +379,13 @@ DEP_CPP_INFCO=\ ...@@ -379,13 +379,13 @@ DEP_CPP_INFCO=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -407,13 +407,13 @@ DEP_CPP_INFFA=\ ...@@ -407,13 +407,13 @@ DEP_CPP_INFFA=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -431,13 +431,13 @@ DEP_CPP_INFLA=\ ...@@ -431,13 +431,13 @@ DEP_CPP_INFLA=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -455,13 +455,13 @@ DEP_CPP_INFTR=\ ...@@ -455,13 +455,13 @@ DEP_CPP_INFTR=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -482,13 +482,13 @@ DEP_CPP_INFUT=\ ...@@ -482,13 +482,13 @@ DEP_CPP_INFUT=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -506,13 +506,13 @@ DEP_CPP_TREES=\ ...@@ -506,13 +506,13 @@ DEP_CPP_TREES=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -528,13 +528,13 @@ SOURCE=.\uncompr.c ...@@ -528,13 +528,13 @@ SOURCE=.\uncompr.c
DEP_CPP_UNCOM=\ DEP_CPP_UNCOM=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -551,7 +551,7 @@ SOURCE=.\unzip.c ...@@ -551,7 +551,7 @@ SOURCE=.\unzip.c
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -568,7 +568,7 @@ SOURCE=.\zip.c ...@@ -568,7 +568,7 @@ SOURCE=.\zip.c
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -593,13 +593,13 @@ DEP_CPP_ZUTIL=\ ...@@ -593,13 +593,13 @@ DEP_CPP_ZUTIL=\
".\zconf.h"\ ".\zconf.h"\
".\zlib.h"\ ".\zlib.h"\
".\zutil.h"\ ".\zutil.h"\
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutAsm"
!ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll" !ELSEIF "$(CFG)" == "zlibvc - Win32 ReleaseWithoutCrtdll"
!ENDIF !ENDIF
# End Source File # End Source File
# End Group # End Group
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7