diff options
| author | unknown <Greg@greg-laptop.> | 2004-03-22 13:42:22 -0700 |
|---|---|---|
| committer | unknown <Greg@greg-laptop.> | 2004-03-22 13:42:22 -0700 |
| commit | b4312dc5e0d27f6718331ff6f74b0338ab7833ef (patch) | |
| tree | 2539b09230780aeb86ae21aaaf0c6ae135707cd1 | |
| parent | 78b4ba746b79ea7d89044e3eecd56338a8f4eb6f (diff) | |
| parent | fdcf1401ca68f5b8b7d0e8b1b4950788e7e91af6 (diff) | |
| download | mariadb-git-b4312dc5e0d27f6718331ff6f74b0338ab7833ef.tar.gz | |
Merge gweir@build.mysql.com:/home/bk/mysql-4.1
into greg-laptop.:C:/cygwin/bk/mysql-4.1
sql/item.h:
Auto merged
| -rw-r--r-- | VC++Files/mysys/mysys.dsp | 8 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp index f81614b6295..a7be57d94c0 100644 --- 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 diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index 9678a0faed3..af75cfa84aa 100644 --- 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" |