innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/r/rpl_server_id2.result:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/slave.cc:
  Merge with 4.0