Docs/manual.texi:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/mysqld.cc:
  Use local version.