summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2004-06-24 18:01:13 +0200
committerunknown <lenz@mysql.com>2004-06-24 18:01:13 +0200
commitb9c2e18541a197c27b105f92afe74a0239b8efdf (patch)
tree3a8e896fb5d1a2efa44536f28ddc05a5bc763ac0
parent73d9c9b129475dec400092badb9c1adec892a4da (diff)
parentd132f0e80e7b0a838d1086ad76ac5a305fffd3c1 (diff)
downloadmariadb-git-b9c2e18541a197c27b105f92afe74a0239b8efdf.tar.gz
Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
-rw-r--r--VC++Files/innobase/innobase.dsp4
-rw-r--r--VC++Files/libmysqld/libmysqld.dsp4
2 files changed, 8 insertions, 0 deletions
diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp
index a147fb3438c..0768b3095ea 100644
--- a/VC++Files/innobase/innobase.dsp
+++ b/VC++Files/innobase/innobase.dsp
@@ -368,6 +368,10 @@ 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
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp
index 8d4dac20b6c..2cdb78fa5d1 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -564,6 +564,10 @@ SOURCE=..\sql\time.cpp
# End Source File
# Begin Source File
+SOURCE=..\sql\tztime.cpp
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\uniques.cpp
# End Source File
# Begin Source File