diff options
| author | unknown <jimw@mysql.com> | 2005-08-02 16:50:09 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-02 16:50:09 -0700 |
| commit | 937f46fb049c15a632319254d5222ea31a0849d2 (patch) | |
| tree | df3a47a65858bc803df1e3897de1738ce72265a2 /VC++Files/libmysql | |
| parent | 88105618c5eba3714189875a8d799cb7503bd657 (diff) | |
| parent | f56dd2a0fa24b154aa71307e12283e43c7ff0914 (diff) | |
| download | mariadb-git-937f46fb049c15a632319254d5222ea31a0849d2.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-7003
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
libmysql/Makefile.shared:
Auto merged
sql/mysqld.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'VC++Files/libmysql')
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysql/libmysql_ia64.dsp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp index 883557e7b63..e17bee12d1b 100644 --- a/VC++Files/libmysql/libmysql.dsp +++ b/VC++Files/libmysql/libmysql.dsp @@ -535,6 +535,10 @@ SOURCE=..\strings\strxnmov.c # End Source File # Begin Source File +SOURCE=..\strings\str_alloc.c +# End Source File +# Begin Source File + SOURCE=..\mysys\thr_mutex.c # End Source File # Begin Source File diff --git a/VC++Files/libmysql/libmysql_ia64.dsp b/VC++Files/libmysql/libmysql_ia64.dsp index 717125d5497..dc8778cfe23 100644 --- a/VC++Files/libmysql/libmysql_ia64.dsp +++ b/VC++Files/libmysql/libmysql_ia64.dsp @@ -522,6 +522,10 @@ SOURCE=..\strings\strxnmov.c # End Source File # Begin Source File +SOURCE=..\strings\str_alloc.c +# End Source File +# Begin Source File + SOURCE=..\mysys\thr_mutex.c # End Source File # Begin Source File |