Docs/manual.texi:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/sql_acl.cc:
  Merge with 3.23.53 (fixes problem with critical region in GRANT)
sql/sql_insert.cc:
  Merge with 3.23.53 (no changes)
sql/sql_parse.cc:
  Merge with 3.23.53 (no changes)
sql/sql_udf.cc:
  Merge with 3.23.53 (indent change)
sql/table.h:
  Merge with 3.23.53 (no changes)