diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-05-23 19:01:16 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-05-23 19:01:16 +0200 |
| commit | 3e2417ed57a8741a366e365839daa1e5bf0ec5cd (patch) | |
| tree | 92425903a86b8180d4e747e7e84398c26768bcb7 /VC++Files | |
| parent | 7ff2a5a54371568a414dfbd77082427186d6a83c (diff) | |
| parent | d35e537a685d44eb43cf59f3539227e45efb8d00 (diff) | |
| download | mariadb-git-3e2417ed57a8741a366e365839daa1e5bf0ec5cd.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_global.h:
Auto merged
myisam/rt_split.c:
Auto merged
sql/field_conv.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/my_vsnprintf.c:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysqld/libmysqld.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/mysys/mysys.dsp | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index b94aaf07bed..1db5ed538a4 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -219,6 +219,10 @@ SOURCE=..\mysys\default.c # End Source File # Begin Source File +SOURCE=..\mysys\default_modify.c +# End Source File +# Begin Source File + SOURCE=.\dll.c # End Source File # Begin Source File diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index c5c40b07dfd..a82538c91dd 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -180,6 +180,10 @@ SOURCE=..\mysys\default.c # End Source File # Begin Source File +SOURCE=..\mysys\default_modify.c +# End Source File +# Begin Source File + SOURCE=..\sql\derror.cpp
# End Source File
# Begin Source File
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp index 428f75d0045..ab5077810b2 100644 --- a/VC++Files/mysys/mysys.dsp +++ b/VC++Files/mysys/mysys.dsp @@ -209,6 +209,10 @@ SOURCE=.\default.c # End Source File # Begin Source File +SOURCE=.\default_modify.c +# End Source File +# Begin Source File + SOURCE=.\errors.c # End Source File # Begin Source File |