acinclude.m4:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  Auto merged