diff options
| author | unknown <monty@mysql.com> | 2004-05-19 16:51:03 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-19 16:51:03 +0300 |
| commit | 6e8252a534ae419f1209bb717631849656f5e7eb (patch) | |
| tree | 07b74cae9cff7e2513d2adad402a4708180791fb /VC++Files/libmysqltest | |
| parent | 4eb67ce4cae48a36d0e79d0fb1878353944a7f90 (diff) | |
| parent | 2d67f1e0cf5270f37816669bc8d7e606abce1469 (diff) | |
| download | mariadb-git-6e8252a534ae419f1209bb717631849656f5e7eb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'VC++Files/libmysqltest')
| -rw-r--r-- | VC++Files/libmysqltest/myTest.dsp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VC++Files/libmysqltest/myTest.dsp b/VC++Files/libmysqltest/myTest.dsp index 1d3a790edd5..ca0f9e6e147 100644 --- a/VC++Files/libmysqltest/myTest.dsp +++ b/VC++Files/libmysqltest/myTest.dsp @@ -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 /W3 /O2 /I "..\include" /D "NDEBUG" /D "DBUG_UFF" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /G6 /W3 /O2 /I "..\include" /D "DBUG_UFF" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" |