diff options
| author | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
| commit | a5717a950b77197b803ff8de013e882471c23cc1 (patch) | |
| tree | 5ed4e118d371f2a1d84eaaef85c5869d24977363 /VC++Files | |
| parent | 1369e5434174a1c7fa7feb9fb1eac6c680a8f078 (diff) | |
| parent | 00d5816b6dc8740f4010dc15e68caeeff6a6954a (diff) | |
| download | mariadb-git-a5717a950b77197b803ff8de013e882471c23cc1.tar.gz | |
merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/que/que0que.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/client/mysqlclient.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/innobase/innobase.dsp | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp index a46c3fd2369..c680ba28116 100644 --- a/VC++Files/client/mysqlclient.dsp +++ b/VC++Files/client/mysqlclient.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "NDEBUG" /FD /c +# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_TLS" /D "MYSQL_CLIENT" /D "NDEBUG" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -65,7 +65,7 @@ LIB32=xilink6.exe -lib # PROP Intermediate_Dir "debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /FD /c +# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /D "USE_TLS" /D "MYSQL_CLIENT" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp index 0768b3095ea..706938626e8 100644 --- a/VC++Files/innobase/innobase.dsp +++ b/VC++Files/innobase/innobase.dsp @@ -312,10 +312,6 @@ SOURCE=.\pars\pars0sym.c # End Source File # Begin Source File -SOURCE=.\que\que0que.c -# End Source File -# Begin Source File - SOURCE=.\read\read0read.c # End Source File # Begin Source File @@ -368,10 +364,6 @@ SOURCE=.\row\row0vers.c # End Source File # Begin Source File -SOURCE=.\srv\srv0que.c -# End Source File -# Begin Source File - SOURCE=.\srv\srv0srv.c # End Source File # Begin Source File |