Commit 5b6c1348 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mishka.local:/home/my/mysql-5.0


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysys/default.c:
  SCCS merged
parents abde46de 68b4d7b7

VC++Files/client/mysqlclient.dsp

+0 −4
Original line number Diff line number Diff line
@@ -451,10 +451,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\libmysql\my_time.c

# End Source File

# Begin Source File

VC++Files/client/mysqlclient_ia64.dsp

+0 −4
Original line number Diff line number Diff line
@@ -436,10 +436,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_thr_init.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql.dsp

+0 −4
Original line number Diff line number Diff line
@@ -419,10 +419,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_thr_init.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql_ia64.dsp

+0 −4
Original line number Diff line number Diff line
@@ -406,10 +406,6 @@ SOURCE=..\mysys\my_symlink2.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_thr_init.c

# End Source File

# Begin Source File

VC++Files/mysys/mysys.dsp

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

# Begin Source File



SOURCE=.\my_tempnam.c

# End Source File

# Begin Source File



SOURCE=.\my_thr_init.c

# End Source File

# Begin Source File