1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/space/my/mysql-5.0
This commit is contained in:
unknown 2004-07-16 21:08:23 +02:00
commit e6795a7c6f
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
VC++Files/libmysqld/libmysqld.dsp
View File

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

14
VC++Files/sql/mysqld.dsp
View File

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