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


innobase/include/row0mysql.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged