summaryrefslogtreecommitdiff
path: root/VC++Files
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-03-16 22:41:30 +0200
committermonty@mysql.com <>2004-03-16 22:41:30 +0200
commit350b4335696fc88efa2bbf2139d2f8bf9aa5701c (patch)
treeaf285d8080c003d1ecb1479ec43c9b6996fd567f /VC++Files
parent861bf3c8c031ea80076acb7f7466bda73b23213c (diff)
parent325f6615254c871d71d9d71bb5910a61d9a61ea2 (diff)
downloadmariadb-git-350b4335696fc88efa2bbf2139d2f8bf9aa5701c.tar.gz
merge with 4.0
Diffstat (limited to 'VC++Files')
-rw-r--r--VC++Files/innobase/innobase.dsp4
-rw-r--r--VC++Files/libmysql/libmysql.dsp4
2 files changed, 4 insertions, 4 deletions
diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp
index 42d7001bdd4..e32f242be80 100644
--- a/VC++Files/innobase/innobase.dsp
+++ b/VC++Files/innobase/innobase.dsp
@@ -280,10 +280,6 @@ SOURCE=.\mtr\mtr0mtr.c
# End Source File
# Begin Source File
-SOURCE=.\odbc\odbc0odbc.c
-# End Source File
-# Begin Source File
-
SOURCE=.\os\os0file.c
# End Source File
# Begin Source File
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp
index ca7ff2823ec..8b36016f8c1 100644
--- a/VC++Files/libmysql/libmysql.dsp
+++ b/VC++Files/libmysql/libmysql.dsp
@@ -499,6 +499,10 @@ SOURCE=..\strings\strxmov.c
# End Source File
# Begin Source File
+SOURCE=..\strings\strxnmov.c
+# End Source File
+# Begin Source File
+
SOURCE=..\mysys\thr_mutex.c
# End Source File
# Begin Source File