summaryrefslogtreecommitdiff
path: root/VC++Files
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-25 15:53:29 +0300
committerunknown <monty@mysql.com>2004-05-25 15:53:29 +0300
commit137af9003dc23bfdab76d64d114ad81dda7682ae (patch)
tree7edb4e97bdfe2c773cfffa70360c561810e6bfa7 /VC++Files
parentb7e8f418c25d087db79a925d41718abfd1073b45 (diff)
downloadmariadb-git-137af9003dc23bfdab76d64d114ad81dda7682ae.tar.gz
Fixed VC++ project files
VC++Files/copy_mysql_files.bat: Added /Y to avoid questions Fixed wrong path for copying data files VC++Files/sql/mysqld.dsp: Added missing compiler option
Diffstat (limited to 'VC++Files')
-rw-r--r--VC++Files/copy_mysql_files.bat12
-rw-r--r--VC++Files/sql/mysqld.dsp2
2 files changed, 7 insertions, 7 deletions
diff --git a/VC++Files/copy_mysql_files.bat b/VC++Files/copy_mysql_files.bat
index 8f5789b9dfd..2857fabc312 100644
--- a/VC++Files/copy_mysql_files.bat
+++ b/VC++Files/copy_mysql_files.bat
@@ -68,13 +68,13 @@ copy libmysqltest\release\myTest.exe c:\mysql\examples\libmysqltest
REM Copy share, docs etc
-xcopy share\*.* c:\mysql\share /E
-xcopy scripts\*.* c:\mysql\scripts /E
-xcopy docs\*.* c:\mysql\docs /E
-xcopy docs\readme c:\mysql\
-xcopy sql-bench\*.* c:\mysql\bench /E
+xcopy share\*.* c:\mysql\share /E /Y
+xcopy scripts\*.* c:\mysql\scripts /E /Y
+xcopy docs\*.* c:\mysql\docs /E /Y
+xcopy sql-bench\*.* c:\mysql\bench /E /Y
+copy docs\readme c:\mysql\
REM Copy privilege tables (Delete old ones as they may be from a newer version)
del c:\mysql\data\mysql\*.* /Q
-copy data\*.* c:\mysql\data
+xcopy data\mysql\*.* c:\mysql\data\mysql /E /Y
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 767276a91fd..6045188b29a 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -243,7 +243,7 @@ LINK32=xilink6.exe
# 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
# 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" /FD /D MYSQL_SERVER_SUFFIX=-nt /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" /FD /D LICENSE=Commercial /D MYSQL_SERVER_SUFFIX=-nt /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"