summaryrefslogtreecommitdiff
path: root/VC++Files
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-11-20 22:06:25 +0200
committermonty@mysql.com <>2003-11-20 22:06:25 +0200
commit7c6113a39f56832da982cfb4ff191e9db49ca798 (patch)
tree685b3a2a60fc00121d338cb0b5f84b4cd028bfe1 /VC++Files
parentba659679e7816cd9c992c866645f65b06e5f69de (diff)
downloadmariadb-git-7c6113a39f56832da982cfb4ff191e9db49ca798.tar.gz
Merge key cache structures to one
Fixed compiler warnings (IRIX C compiler and VC++)
Diffstat (limited to 'VC++Files')
-rw-r--r--VC++Files/client/mysqlclient.dsp4
-rw-r--r--VC++Files/libmysql/libmysql.dsp4
-rw-r--r--VC++Files/myisam/myisam.dsp10
-rw-r--r--VC++Files/mysys/mysys.dsp4
4 files changed, 19 insertions, 3 deletions
diff --git a/VC++Files/client/mysqlclient.dsp b/VC++Files/client/mysqlclient.dsp
index 685c9ae1a15..4a9d52232ca 100644
--- a/VC++Files/client/mysqlclient.dsp
+++ b/VC++Files/client/mysqlclient.dsp
@@ -100,6 +100,10 @@ SOURCE=..\strings\bmove_upp.c
# End Source File
# Begin Source File
+SOURCE="..\mysys\charset-def.c"
+# End Source File
+# Begin Source File
+
SOURCE=..\mysys\charset.c
# End Source File
# Begin Source File
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp
index 8ab15a03110..6b76a6147ff 100644
--- a/VC++Files/libmysql/libmysql.dsp
+++ b/VC++Files/libmysql/libmysql.dsp
@@ -119,6 +119,10 @@ SOURCE=..\strings\bmove_upp.c
# End Source File
# Begin Source File
+SOURCE="..\mysys\charset-def.c"
+# End Source File
+# Begin Source File
+
SOURCE=..\mysys\charset.c
# End Source File
# Begin Source File
diff --git a/VC++Files/myisam/myisam.dsp b/VC++Files/myisam/myisam.dsp
index 38cac3a0aba..0b386997e5e 100644
--- a/VC++Files/myisam/myisam.dsp
+++ b/VC++Files/myisam/myisam.dsp
@@ -25,7 +25,7 @@ CFG=myisam - Win32 Debug
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
RSC=rc.exe
!IF "$(CFG)" == "myisam - Win32 Release"
@@ -47,7 +47,7 @@ RSC=rc.exe
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib_release\myisam.lib"
@@ -70,7 +70,7 @@ LIB32=link.exe -lib
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
-LIB32=link.exe -lib
+LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib_Debug\myisam.lib"
@@ -169,6 +169,10 @@ SOURCE=.\mi_key.c
# End Source File
# Begin Source File
+SOURCE=.\mi_keycache.c
+# End Source File
+# Begin Source File
+
SOURCE=.\mi_locking.c
# End Source File
# Begin Source File
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp
index 54345816884..1867a3d02d4 100644
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -126,6 +126,10 @@ SOURCE=.\array.c
# End Source File
# Begin Source File
+SOURCE=".\charset-def.c"
+# End Source File
+# Begin Source File
+
SOURCE=.\charset.c
# End Source File
# Begin Source File