Docs/manual.texi:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/slave.cc:
  keep local copy