into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0


mysql-test/t/innodb.test:
  Auto merged
mysql-test/r/innodb.result:
  manual merge use local 5.1
mysql-test/r/multi_update.result:
  manual merge
mysql-test/t/multi_update.test:
  manual merge
sql/sql_update.cc:
  manual merge