sql/slave.h:
  Auto merged
sql/slave.cc:
  Auto merged
Docs/manual.texi:
  merged
sql/sql_base.cc:
  merged
sql/sql_show.cc:
  merged