mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Manual merge from 5.0. In 5.0 this was in another file.
sql/field.cc:
  Removed unused variable.