summaryrefslogtreecommitdiff
path: root/VC++Files/libmysqld
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-08-02 16:50:09 -0700
committerjimw@mysql.com <>2005-08-02 16:50:09 -0700
commit97797d91fbd18d8bd041b9ee5855c5ea46f976ce (patch)
treedf3a47a65858bc803df1e3897de1738ce72265a2 /VC++Files/libmysqld
parent2b70615913c3369867932011728d320e4a5a1a0b (diff)
parent409592e6529828283ee4867ee743db1b4b4c15a7 (diff)
downloadmariadb-git-97797d91fbd18d8bd041b9ee5855c5ea46f976ce.tar.gz
Merge mysql.com:/home/jimw/my/mysql-5.0-7003
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'VC++Files/libmysqld')
-rw-r--r--VC++Files/libmysqld/libmysqld.dsp4
-rw-r--r--VC++Files/libmysqld/libmysqld_ia64.dsp4
2 files changed, 8 insertions, 0 deletions
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp
index 49ecedfa055..0fb3a645a48 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -600,6 +600,10 @@ SOURCE=..\strings\strxnmov.c
# End Source File
# Begin Source File
+SOURCE=..\strings\str_alloc.c
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\table.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/libmysqld/libmysqld_ia64.dsp b/VC++Files/libmysqld/libmysqld_ia64.dsp
index fe99ea480c7..b5223e38f2d 100644
--- a/VC++Files/libmysqld/libmysqld_ia64.dsp
+++ b/VC++Files/libmysqld/libmysqld_ia64.dsp
@@ -538,6 +538,10 @@ SOURCE=..\strings\strxnmov.c
# End Source File
# Begin Source File
+SOURCE=..\strings\str_alloc.c
+# End Source File
+# Begin Source File
+
SOURCE=..\sql\table.cpp
# End Source File
# Begin Source File