into hundin.mysql.fi:/home/jan/mysql-5.0


innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged