Docs/manual.texi:
  Auto merged
sql/sql_show.cc:
  Auto merged
BUILD/compile-pentium:
  SCCS merged