database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

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


sql/item.h:
  Auto merged
This commit is contained in:
unknown
2004-03-22 13:42:22 -07:00
parent 78b4ba746b fdcf1401ca
commit b4312dc5e0
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
VC++Files/mysys/mysys.dsp
View File

@@ -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

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

@@ -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"