Commit f8610ecb authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Merge hundin:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0

parents 5e5b311a efaaf0b4
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -50453,6 +50453,8 @@ each individual 4.0.x release.
@itemize @bullet
@item
One didn't get an error message if mysqld couldn't open the privilege tables.
@item
@code{SET PASSWORD FOR ...} closed the connection in case of errors (bug
from 4.0.3).
@item
+2 −139
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "bdb___Win32_Max"
# PROP Intermediate_Dir "bdb___Win32_Max"
# PROP Output_Dir "max"
# PROP Intermediate_Dir "max"
# 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
@@ -88,522 +88,418 @@ LIB32=link.exe -lib
# Begin Source File

SOURCE=.\btree\bt_compare.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_curadj.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_cursor.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_delete.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_put.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_reclaim.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_recno.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_rsearch.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_search.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_split.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_upgrade.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\bt_verify.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\btree\btree_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\crdel_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\crdel_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\cxx\cxx_app.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\cxx\cxx_except.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\cxx\cxx_lock.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\cxx\cxx_log.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\cxx\cxx_mpool.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\cxx\cxx_table.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\cxx\cxx_txn.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_am.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\common\db_byteorder.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_cam.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_dispatch.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_dup.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\common\db_err.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\common\db_getlong.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_iface.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_join.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\common\db_log2.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_meta.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_overflow.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_pr.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_reclaim.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_ret.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\env\db_salloc.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\env\db_shash.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_upg.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_upg_opd.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_vrfy.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\db\db_vrfyutil.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\dbm\dbm.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\env\env_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\env\env_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\env\env_recover.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\env\env_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_dup.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_func.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_meta.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_page.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_reclaim.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_upgrade.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hash\hash_verify.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\hsearch\hsearch.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\lock\lock.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\lock\lock_conflict.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\lock\lock_deadlock.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\lock\lock_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\lock\lock_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\lock\lock_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\lock\lock_util.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_archive.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_compare.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_findckp.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_get.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_put.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\log\log_register.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_alloc.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_bh.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_fget.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_fopen.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_fput.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_fset.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_register.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_sync.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mp\mp_trickle.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mutex\mut_tas.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\mutex\mutex.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os_win32\os_abs.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

@@ -612,22 +508,18 @@ SOURCE=.\os\os_alloc.c
# Begin Source File

SOURCE=.\os_win32\os_dir.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os_win32\os_errno.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os_win32\os_fid.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os_win32\os_finit.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

@@ -640,7 +532,6 @@ SOURCE=.\os\os_handle.c
# Begin Source File

SOURCE=.\os_win32\os_map.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

@@ -653,7 +544,6 @@ SOURCE=.\os\os_oflags.c
# Begin Source File

SOURCE=.\os_win32\os_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

@@ -662,7 +552,6 @@ SOURCE=.\os\os_region.c
# Begin Source File

SOURCE=.\os_win32\os_rename.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

@@ -679,87 +568,70 @@ SOURCE=.\os\os_rw.c
# Begin Source File

SOURCE=.\os_win32\os_seek.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os_win32\os_sleep.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os_win32\os_spin.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os\os_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os\os_tmpdir.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os_win32\os_type.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\os\os_unlink.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_files.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_upgrade.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\qam\qam_verify.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

@@ -768,47 +640,38 @@ SOURCE=.\clib\strcasecmp.c
# Begin Source File

SOURCE=.\txn\txn.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\txn\txn_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\txn\txn_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\txn\txn_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\common\util_log.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\common\util_sig.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\xa\xa.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\xa\xa_db.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# Begin Source File

SOURCE=.\xa\xa_map.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File
# End Group
# Begin Group "Header Files"
+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ SOURCE=..\mysys\my_alloc.c
# Begin Source File

SOURCE=..\mysys\my_compress.c
# ADD CPP /I "../zlib"
# End Source File
# Begin Source File

+4 −4
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "innobase___Win32_Debug"
# PROP Intermediate_Dir "innobase___Win32_Debug"
# PROP Output_Dir "debug"
# PROP Intermediate_Dir "debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /GX /Z7 /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
@@ -60,8 +60,8 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "innobase___Win32_Release0"
# PROP Intermediate_Dir "innobase___Win32_Release0"
# PROP Output_Dir "release"
# PROP Intermediate_Dir "release"
# 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 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
+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,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" /D "MYSQL_SERVER" /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -67,7 +67,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /I "../sql" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -88,7 +88,7 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File

SOURCE=.\mysqlbinlog.cpp
SOURCE=..\client\mysqlbinlog.cpp
# End Source File
# End Group
# Begin Group "Header Files"
Loading