1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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
This commit is contained in:
unknown
2005-08-02 16:50:09 -07:00
17 changed files with 113 additions and 10 deletions

View File

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

View File

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