Commit 937f46fb authored by unknown's avatar unknown
Browse files

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
parents 88105618 f56dd2a0

VC++Files/client/mysqlclient.dsp

+4 −0
Original line number Diff line number Diff line
@@ -567,6 +567,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

VC++Files/client/mysqlclient_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -548,6 +548,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

VC++Files/libmysql/libmysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/libmysql/libmysql_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -600,6 +600,10 @@ SOURCE=..\strings\strxnmov.c 
# End Source File

# Begin Source File



SOURCE=..\strings\str_alloc.c

# End Source File

# Begin Source File



SOURCE=..\sql\table.cpp

# End Source File

# Begin Source File