Merge gweir@build.mysql.com:/home/bk/mysql-4.1

into greg-laptop.:C:/cygwin/bk/mysql-4.1

Merge gweir@build.mysql.com:/home/bk/mysql-4.1
into greg-laptop.:C:/cygwin/bk/mysql-4.1
de09e55b · Greg@greg-laptop · 6158c94b · 7ec29e9f · de09e55b · de09e55b
Commit de09e55b authored Mar 22, 2004 by Greg@greg-laptop
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

VC++Files/mysys/mysys.dsp VC++Files/mysys/mysys.dsp +8 -0

VC++Files/sql/mysqld.dsp VC++Files/sql/mysqld.dsp +0 -4

No files found.
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -330,10 +330,18 @@ SOURCE=.\my_gethostbyname.c
 # End Source File
 # Begin Source File

+SOURCE=.\my_gethwaddr.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\my_getopt.c
 # End Source File
 # Begin Source File

+SOURCE=.\my_getsystime.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\my_getwd.c
 # End Source File
 # Begin Source File

--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -711,10 +711,6 @@ SOURCE=.\nt_servc.h
 # End Source File
 # Begin Source File

-SOURCE=.\opt_ft.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\opt_range.cpp

 !IF  "$(CFG)" == "mysqld - Win32 Release"