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

into mysql.com:/opt/local/work/mysql-5.0-root


include/my_dbug.h:
  Auto merged
sql/mysqld.cc:
  Auto merged