mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
sql/table.h:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Using local 5.0 version.
sql/mysql_priv.h:
  Merged.
sql/sql_insert.cc:
  Merge needs fixes.