Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread


sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_rename.cc:
  merge
sql/sql_table.cc:
  merge