Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel


client/client_priv.h:
  Auto merged
client/mysqlslap.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2007-03-29 16:11:29 +02:00
commit 019446f059
27 changed files with 1252 additions and 456 deletions

File diff suppressed because it is too large Load diff