into avenger.(none):/export/brian/mysql/test/5.0


client/mysqldump.c:
  Auto merged
myisam/mi_check.c:
  Auto merged