Merge lgrimmer@build.mysql.com:/home/bk/mysql-5.0

into mysql.com:/space/my/mysql-5.0

VC++Files/libmysqld/libmysqld.dsp

@@ -351,6 +351,10 @@ SOURCE=..\mysys\my_alloc.c
 SOURCE=..\mysys\my_getopt.c
 # End Source File
 # Begin Source File
+ 
+SOURCE=..\sql-common\my_time.c
+# End Source File
+# Begin Source File
 
 SOURCE=..\sql\net_serv.cpp
 # End Source File
@@ -364,11 +368,11 @@ SOURCE=..\sql\opt_sum.cpp
 # End Source File
 # Begin Source File
 
-SOURCE="..\sql-common\pack.c"
+SOURCE=..\sql-common\pack.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\sql-common\my_time.c
+SOURCE=..\sql\parse_file.cpp
 # End Source File
 # Begin Source File
 
@@ -549,6 +553,10 @@ SOURCE=..\sql\sql_union.cpp
 # Begin Source File
 
 SOURCE=..\sql\sql_update.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\sql\sql_view.cpp
 # End Source File
 # Begin Source File
 

VC++Files/sql/mysqld.dsp

@@ -942,11 +942,15 @@ SOURCE=.\mf_iocache.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # Begin Source File
 
+SOURCE=.\my_time.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\myisammrg\myrg_rnext_same.c
 # End Source File
 # Begin Source File
@@ -1053,7 +1057,7 @@ SOURCE=.\pack.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\my_time.c
+SOURCE=.\parse_file.cpp
 # End Source File
 # Begin Source File
 
@@ -1723,8 +1727,12 @@ SOURCE=.\sql_update.cpp
 
 !ELSEIF  "$(CFG)" == "mysqld - Win32 pro nt"
 
-!ENDIF
+!ENDIF 
+
+# End Source File
+# Begin Source File
 
+SOURCE=.\sql_view.cpp
 # End Source File
 # Begin Source File